2017-2-24

LICENSE

@@ -1,41 +1,57 @@
-MIT License
+BSD 3-Clause License
 
 
 
-Copyright (c) 2017 o2oa
+Copyright (c) 2017, o2oa
 
+All rights reserved.
 
 
-Permission is hereby granted, free of charge, to any person obtaining a copy
 
-of this software and associated documentation files (the "Software"), to deal
+Redistribution and use in source and binary forms, with or without
 
-in the Software without restriction, including without limitation the rights
+modification, are permitted provided that the following conditions are met:
 
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 
-copies of the Software, and to permit persons to whom the Software is
 
-furnished to do so, subject to the following conditions:
+* Redistributions of source code must retain the above copyright notice, this
 
+  list of conditions and the following disclaimer.
 
 
-The above copyright notice and this permission notice shall be included in all
 
-copies or substantial portions of the Software.
+* Redistributions in binary form must reproduce the above copyright notice,
 
+  this list of conditions and the following disclaimer in the documentation
 
+  and/or other materials provided with the distribution.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+* Neither the name of the copyright holder nor the names of its
 
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+  contributors may be used to endorse or promote products derived from
 
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+  this software without specific prior written permission.
 
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 
-SOFTWARE.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

x_desktop_web/.idea/deployment.xml

@@ -2,6 +2,13 @@
 <project version="4">
   <component name="PublishConfigData" autoUpload="Always" serverName="dev.xplatform.tech">
     <serverData>
+      <paths name="demo.xplatform.tech">
+        <serverdata>
+          <mappings>
+            <mapping deploy="/" local="$PROJECT_DIR$" web="/" />
+          </mappings>
+        </serverdata>
+      </paths>
       <paths name="demo.zhiheyun.net">
         <serverdata>
           <mappings>
@@ -16,6 +23,20 @@
           </mappings>
         </serverdata>
       </paths>
+      <paths name="dev81">
+        <serverdata>
+          <mappings>
+            <mapping deploy="\" local="$PROJECT_DIR$" web="/" />
+          </mappings>
+        </serverdata>
+      </paths>
+      <paths name="o2server9081">
+        <serverdata>
+          <mappings>
+            <mapping deploy="\" local="$PROJECT_DIR$" web="/" />
+          </mappings>
+        </serverdata>
+      </paths>
     </serverData>
     <option name="myAutoUpload" value="ALWAYS" />
   </component>

x_desktop_web/.idea/libraries/Generated_files.xml

@@ -1169,24 +1169,15 @@
         <item url="file://$PROJECT_DIR$/x_component_File/AttachmentController.min.js" />
         <item url="file://$PROJECT_DIR$/x_desktop/res/framework/ace/src-min/snippets/cobol.min.js" />
         <item url="file://$PROJECT_DIR$/x_desktop/res/framework/htmleditor/ckeditor451/plugins/specialchar/dialogs/lang/et.min.js" />
-        <item url="file://$PROJECT_DIR$/x_component_cms_ColumnManager/CategoryExplorerV2.min.js" />
         <item url="file://$PROJECT_DIR$/x_desktop/res/framework/ace/src-min/snippets/toml.min.js" />
-        <item url="file://$PROJECT_DIR$/x_component_cms_ColumnManager/DictionaryExplorer.min.js" />
         <item url="file://$PROJECT_DIR$/x_desktop/res/framework/ace/src-min/snippets/sass.min.js" />
-        <item url="file://$PROJECT_DIR$/x_component_cms_ColumnManager/Main.min.js" />
         <item url="file://$PROJECT_DIR$/x_desktop/res/framework/ace/src-min/snippets/scss.min.js" />
-        <item url="file://$PROJECT_DIR$/x_component_cms_ColumnManager/Explorer.min.js" />
         <item url="file://$PROJECT_DIR$/x_desktop/res/framework/ace/src-min/snippets/scad.min.js" />
-        <item url="file://$PROJECT_DIR$/x_component_cms_ColumnManager/ViewExplorer.min.js" />
         <item url="file://$PROJECT_DIR$/x_desktop/res/framework/ace/src-min/snippets/text.min.js" />
-        <item url="file://$PROJECT_DIR$/x_component_cms_ColumnManager/package.min.js" />
         <item url="file://$PROJECT_DIR$/x_desktop/res/framework/ace/src-min/snippets/rust.min.js" />
         <item url="file://$PROJECT_DIR$/x_desktop/res/framework/htmleditor/ckeditor451/plugins/specialchar/dialogs/lang/es.min.js" />
-        <item url="file://$PROJECT_DIR$/x_component_cms_ColumnManager/ScriptExplorer.min.js" />
         <item url="file://$PROJECT_DIR$/x_desktop/res/framework/ace/src-min/snippets/rdoc.min.js" />
-        <item url="file://$PROJECT_DIR$/x_component_cms_ColumnManager/RestActions.min.js" />
         <item url="file://$PROJECT_DIR$/x_desktop/res/framework/ace/src-min/snippets/ruby.min.js" />
-        <item url="file://$PROJECT_DIR$/x_component_cms_ColumnManager/FormExplorer.min.js" />
         <item url="file://$PROJECT_DIR$/x_desktop/res/framework/ace/src-min/snippets/perl.min.js" />
         <item url="file://$PROJECT_DIR$/x_desktop/res/framework/ace/src-min/snippets/maze.min.js" />
         <item url="file://$PROJECT_DIR$/x_component_cms_DictionaryDesigner/Main.min.js" />
@@ -1811,7 +1802,6 @@
         <item url="file://$PROJECT_DIR$/x_desktop/res/framework/htmleditor/ckeditor/plugins/specialchar/dialogs/lang/ug.min.js" />
         <item url="file://$PROJECT_DIR$/x_component_Organization/Selector/package.min.js" />
         <item url="file://$PROJECT_DIR$/x_desktop/res/mwf4/package/widget/$SimpleEditor/default/ActionSetting.min.js" />
-        <item url="file://$PROJECT_DIR$/x_component_cms_ColumnManager/lp/zh-cn.min.js" />
         <item url="file://$PROJECT_DIR$/x_desktop/res/framework/ace/src-min-noconflict/mode-json.min.js" />
         <item url="file://$PROJECT_DIR$/x_desktop/res/framework/htmleditor/ckeditor/plugins/specialchar/dialogs/lang/zh.min.js" />
         <item url="file://$PROJECT_DIR$/x_desktop/res/framework/ace/src-min-noconflict/mode-haml.min.js" />
@@ -1821,12 +1811,11 @@
         <item url="file://$PROJECT_DIR$/x_desktop/res/framework/htmleditor/ckeditor/plugins/specialchar/dialogs/lang/th.min.js" />
         <item url="file://$PROJECT_DIR$/x_desktop/res/framework/htmleditor/ckeditor/plugins/specialchar/dialogs/lang/sk.min.js" />
         <item url="file://$PROJECT_DIR$/x_desktop/res/framework/ace/src-min-noconflict/mode-dart.min.js" />
-        <item url="file://$PROJECT_DIR$/x_component_cms_ColumnManager/Actions/RestActions.min.js" />
         <item url="file://$PROJECT_DIR$/x_desktop/res/framework/ace/src-min-noconflict/ext-emmet.min.js" />
         <item url="file://$PROJECT_DIR$/x_desktop/res/framework/htmleditor/ckeditor/plugins/specialchar/dialogs/lang/sv.min.js" />
         <item url="file://$PROJECT_DIR$/x_component_Selector/Actions/RestActions.min.js" />
-        <item url="file://$PROJECT_DIR$/x_desktop/res/mwf4/package/widget/$SimpleEditor/Actions/Emotion.min.js" />
         <item url="file://$PROJECT_DIR$/x_desktop/res/framework/ace/src-min-noconflict/mode-abap.min.js" />
+        <item url="file://$PROJECT_DIR$/x_desktop/res/mwf4/package/widget/$SimpleEditor/Actions/Emotion.min.js" />
         <item url="file://$PROJECT_DIR$/x_desktop/res/mwf4/package/widget/$SimpleEditor/Actions/Image.min.js" />
         <item url="file://$PROJECT_DIR$/x_desktop/res/framework/htmleditor/ckeditor/plugins/specialchar/dialogs/lang/sq.min.js" />
         <item url="file://$PROJECT_DIR$/x_component_Deployment/lp/zh-cn.min.js" />
@@ -2314,7 +2303,6 @@
         <item url="file://$PROJECT_DIR$/x_desktop/res/framework/ace/src-min/worker-xquery.min.js" />
         <item url="file://$PROJECT_DIR$/x_desktop/res/framework/ace/src-noconflict/mode-less.min.js" />
         <item url="file://$PROJECT_DIR$/x_desktop/res/framework/kityminder/editor/ui/dialog/image/image.ctrl.min.js" />
-        <item url="file://$PROJECT_DIR$/x_component_cms_ColumnManager/CategoryExplorer.min.js" />
         <item url="file://$PROJECT_DIR$/x_desktop/res/framework/htmleditor/tinymce/plugins/importcss/plugin.min.js" />
         <item url="file://$PROJECT_DIR$/x_desktop/res/framework/ace/src-noconflict/mode-json.min.js" />
         <item url="file://$PROJECT_DIR$/x_desktop/res/framework/htmleditor/tinymce/plugins/pagebreak/plugin.min.js" />
@@ -2454,6 +2442,7 @@
         <item url="file://$PROJECT_DIR$/x_desktop/res/framework/ace/src-noconflict/mode-ini.min.js" />
         <item url="file://$PROJECT_DIR$/x_component_Attendance/BDMarkerTool.min.js" />
         <item url="file://$PROJECT_DIR$/x_desktop/res/framework/ace/src-noconflict/mode-elm.min.js" />
+        <item url="file://$PROJECT_DIR$/x_component_cms_ColumnManager/Main.min.js" />
         <item url="file://$PROJECT_DIR$/x_desktop/res/framework/ace/src-noconflict/mode-css.min.js" />
         <item url="file://$PROJECT_DIR$/x_desktop/res/framework/ace/src-noconflict/mode-sh.min.js" />
         <item url="file://$PROJECT_DIR$/x_desktop/res/framework/ace/src-noconflict/mode-dot.min.js" />
@@ -2640,8 +2629,15 @@
         <item url="file://$PROJECT_DIR$/x_desktop/res/framework/ace/src-min/mode-praat.min.js" />
         <item url="file://$PROJECT_DIR$/x_desktop/res/framework/ace/src-min/mode-pgsql.min.js" />
         <item url="file://$PROJECT_DIR$/x_desktop/res/framework/ace/src-min/mode-space.min.js" />
+        <item url="file://$PROJECT_DIR$/x_component_cms_ApplicationManager/DictionaryExplorer.min.js" />
+        <item url="file://$PROJECT_DIR$/x_component_cms_ApplicationManager/QueryViewExplorer.min.js" />
+        <item url="file://$PROJECT_DIR$/x_component_cms_ApplicationManager/CategoryExplorer.min.js" />
+        <item url="file://$PROJECT_DIR$/x_component_cms_ApplicationManager/ScriptExplorer.min.js" />
         <item url="file://$PROJECT_DIR$/x_desktop/res/framework/ace/src-min/mode-latex.min.js" />
+        <item url="file://$PROJECT_DIR$/x_component_cms_ApplicationManager/ViewExplorer.min.js" />
+        <item url="file://$PROJECT_DIR$/x_component_cms_ApplicationManager/FormExplorer.min.js" />
         <item url="file://$PROJECT_DIR$/x_desktop/res/framework/ace/src-min/mode-mysql.min.js" />
+        <item url="file://$PROJECT_DIR$/x_component_cms_ApplicationManager/RestActions.min.js" />
         <item url="file://$PROJECT_DIR$/x_desktop/res/framework/ace/src-min/mode-ocaml.min.js" />
         <item url="file://$PROJECT_DIR$/x_desktop/res/framework/ace/src-min/mode-julia.min.js" />
         <item url="file://$PROJECT_DIR$/x_desktop/res/framework/ace/src-min/mode-curly.min.js" />
@@ -2702,10 +2698,12 @@
         <item url="file://$PROJECT_DIR$/x_component_cms_FormDesigner/lp/zh-cn.min.js" />
         <item url="file://$PROJECT_DIR$/x_component_Selector/Group.min.js" />
         <item url="file://$PROJECT_DIR$/x_component_Selector/Identity.min.js" />
+        <item url="file://$PROJECT_DIR$/x_component_cms_ColumnManager/lp/zh-cn.min.js" />
         <item url="file://$PROJECT_DIR$/x_component_Selector/Role.min.js" />
         <item url="file://$PROJECT_DIR$/x_component_Selector/Person.min.js" />
         <item url="file://$PROJECT_DIR$/x_component_Selector/Department.min.js" />
         <item url="file://$PROJECT_DIR$/x_component_Selector/package.min.js" />
+        <item url="file://$PROJECT_DIR$/x_component_cms_ColumnManager/Actions/RestActions.min.js" />
         <item url="file://$PROJECT_DIR$/x_component_Selector/Company.min.js" />
         <item url="file://$PROJECT_DIR$/x_component_ScriptEditor/Main.min.js" />
         <item url="file://$PROJECT_DIR$/x_component_cms_FormDesigner/Module/Textfield.min.js" />
@@ -2721,8 +2719,10 @@
         <item url="file://$PROJECT_DIR$/x_component_Organization/Selector/FormField.min.js" />
         <item url="file://$PROJECT_DIR$/x_component_Organization/Selector/CMSApplication.min.js" />
         <item url="file://$PROJECT_DIR$/x_component_process_ProcessDesigner/widget/PersonSelector_bak.min.js" />
+        <item url="file://$PROJECT_DIR$/x_component_cms_ApplicationManager/Explorer.min.js" />
+        <item url="file://$PROJECT_DIR$/x_component_cms_ApplicationManager/package.min.js" />
+        <item url="file://$PROJECT_DIR$/x_component_cms_ApplicationManager/Main.min.js" />
         <item url="file://$PROJECT_DIR$/x_component_cms_FormDesigner/Module/Image.min.js" />
-        <item url="file://$PROJECT_DIR$/x_component_cms_ColumnManager/QueryViewExplorer.min.js" />
         <item url="file://$PROJECT_DIR$/x_desktop/res/framework/ace/src-min/mode-glsl.min.js" />
         <item url="file://$PROJECT_DIR$/x_desktop/res/framework/ace/src-min/mode-dart.min.js" />
         <item url="file://$PROJECT_DIR$/x_desktop/res/framework/ace/src-min/mode-diff.min.js" />
@@ -2762,14 +2762,18 @@
         <item url="file://$PROJECT_DIR$/x_desktop/res/framework/ace/src-min/mode-sql.min.js" />
         <item url="file://$PROJECT_DIR$/x_desktop/res/framework/ace/src-min/mode-sjs.min.js" />
         <item url="file://$PROJECT_DIR$/x_desktop/res/framework/ace/src-min/mode-mel.min.js" />
+        <item url="file://$PROJECT_DIR$/x_component_Attendance/$Common/echarts/echarts.common.min.js" />
         <item url="file://$PROJECT_DIR$/x_desktop/res/framework/ace/src-min/mode-nix.min.js" />
         <item url="file://$PROJECT_DIR$/x_desktop/res/framework/ace/src-min/mode-lua.min.js" />
         <item url="file://$PROJECT_DIR$/x_component_Attendance/$Common/fullcalendar/fullcalendar.min.js" />
         <item url="file://$PROJECT_DIR$/x_desktop/res/framework/ace/src-min/mode-jsx.min.js" />
         <item url="file://$PROJECT_DIR$/x_component_cms_FormDesigner/Module/Datagrid.min.js" />
         <item url="file://$PROJECT_DIR$/x_component_cms_FormDesigner/Module/Tab.min.js" />
+        <item url="file://$PROJECT_DIR$/x_component_Attendance/$Common/fullcalendar/lib/moment.min.js" />
         <item url="file://$PROJECT_DIR$/x_desktop/res/mwf4/package/xScript/Actions/DictActions.min.js" />
         <item url="file://$PROJECT_DIR$/x_desktop/res/framework/ace/src-min/mode-lsl.min.js" />
+        <item url="file://$PROJECT_DIR$/x_component_Attendance/$Common/fullcalendar/lib/jquery-ui.custom.min.js" />
+        <item url="file://$PROJECT_DIR$/x_component_Attendance/$Common/fullcalendar/lib/jquery.min.js" />
         <item url="file://$PROJECT_DIR$/x_desktop/res/mwf4/package/xScript/Actions/CMSScriptActions.min.js" />
         <item url="file://$PROJECT_DIR$/x_desktop/res/framework/ace/src-min/mode-jsp.min.js" />
         <item url="file://$PROJECT_DIR$/x_desktop/res/mwf4/package/xScript/Actions/ScriptActions.min.js" />
@@ -2792,8 +2796,8 @@
         <item url="file://$PROJECT_DIR$/x_component_Attendance/$Common/fullcalendar/lang/en-gb.min.js" />
         <item url="file://$PROJECT_DIR$/x_component_Attendance/$Common/fullcalendar/lang/ca.min.js" />
         <item url="file://$PROJECT_DIR$/x_component_Attendance/$Common/fullcalendar/lang/ar.min.js" />
-        <item url="file://$PROJECT_DIR$/x_component_Attendance/$Common/fullcalendar/lang/zh-cn.min.js" />
         <item url="file://$PROJECT_DIR$/x_desktop/res/framework/ace/src-min/mode-elm.min.js" />
+        <item url="file://$PROJECT_DIR$/x_component_Attendance/$Common/fullcalendar/lang/zh-cn.min.js" />
         <item url="file://$PROJECT_DIR$/x_desktop/res/framework/htmleditor/ckeditor/plugins/specialchar/dialogs/specialchar.min.js" />
         <item url="file://$PROJECT_DIR$/x_desktop/res/framework/ace/src-min/mode-ejs.min.js" />
         <item url="file://$PROJECT_DIR$/x_component_Attendance/$Common/fullcalendar/lang/uk.min.js" />
@@ -2828,12 +2832,22 @@
         <item url="file://$PROJECT_DIR$/x_desktop/res/framework/ace/src/theme-tomorrow_night.min.js" />
         <item url="file://$PROJECT_DIR$/x_desktop/res/framework/ace/src/theme-pastel_on_dark.min.js" />
         <item url="file://$PROJECT_DIR$/x_desktop/res/framework/ace/src/ext-static_highlight.min.js" />
+        <item url="file://$PROJECT_DIR$/x_component_cms_ColumnManager/package.min.js" />
+        <item url="file://$PROJECT_DIR$/x_component_cms_ColumnManager/ScriptExplorer.min.js" />
+        <item url="file://$PROJECT_DIR$/x_component_cms_ColumnManager/QueryViewExplorer.min.js" />
+        <item url="file://$PROJECT_DIR$/x_component_cms_ColumnManager/RestActions.min.js" />
+        <item url="file://$PROJECT_DIR$/x_component_cms_ColumnManager/FormExplorer.min.js" />
+        <item url="file://$PROJECT_DIR$/x_component_cms_ColumnManager/ViewExplorer.min.js" />
+        <item url="file://$PROJECT_DIR$/x_component_cms_ColumnManager/Explorer.min.js" />
+        <item url="file://$PROJECT_DIR$/x_component_cms_ColumnManager/CategoryExplorer.min.js" />
+        <item url="file://$PROJECT_DIR$/x_component_cms_ColumnManager/DictionaryExplorer.min.js" />
         <item url="file://$PROJECT_DIR$/x_desktop/res/framework/ace/src/theme-crimson_editor.min.js" />
         <item url="file://$PROJECT_DIR$/x_desktop/res/framework/ace/src/theme-merbivore_soft.min.js" />
         <item url="file://$PROJECT_DIR$/x_desktop/res/framework/ace/src/ext-keybinding_menu.min.js" />
         <item url="file://$PROJECT_DIR$/x_desktop/res/framework/ace/src/mode-mips_assembler.min.js" />
         <item url="file://$PROJECT_DIR$/x_desktop/res/framework/ace/src/ext-language_tools.min.js" />
         <item url="file://$PROJECT_DIR$/x_desktop/res/framework/ace/src/mode-mipsassembler.min.js" />
+        <item url="file://$PROJECT_DIR$/x_component_cms_ApplicationManager/Actions/RestActions.min.js" />
         <item url="file://$PROJECT_DIR$/x_desktop/res/framework/ace/src/theme-idle_fingers.min.js" />
         <item url="file://$PROJECT_DIR$/x_desktop/res/framework/ace/src/mode-soy_template.min.js" />
         <item url="file://$PROJECT_DIR$/x_desktop/res/framework/ace/src/theme-katzenmilch.min.js" />
@@ -2844,8 +2858,8 @@
         <item url="file://$PROJECT_DIR$/x_component_Attendance/$Common/fullcalendar/lang/en-ie.min.js" />
         <item url="file://$PROJECT_DIR$/x_component_Attendance/$Common/fullcalendar/lang/zh-tw.min.js" />
         <item url="file://$PROJECT_DIR$/x_component_Attendance/$Common/fullcalendar/lang/ar-tn.min.js" />
-        <item url="file://$PROJECT_DIR$/x_desktop/res/framework/ace/src/mode-actionscript.min.js" />
         <item url="file://$PROJECT_DIR$/x_component_Attendance/$Common/fullcalendar/lang/nb.min.js" />
+        <item url="file://$PROJECT_DIR$/x_desktop/res/framework/ace/src/mode-actionscript.min.js" />
         <item url="file://$PROJECT_DIR$/x_component_Attendance/$Common/fullcalendar/lang/fr-ca.min.js" />
         <item url="file://$PROJECT_DIR$/x_component_Attendance/$Common/fullcalendar/lang/he.min.js" />
         <item url="file://$PROJECT_DIR$/x_desktop/res/framework/ace/src/ext-settings_menu.min.js" />
@@ -2859,8 +2873,10 @@
         <item url="file://$PROJECT_DIR$/x_component_Attendance/$Common/fullcalendar/lang/nl.min.js" />
         <item url="file://$PROJECT_DIR$/x_component_Attendance/$Common/fullcalendar/lang/ro.min.js" />
         <item url="file://$PROJECT_DIR$/x_component_Attendance/$Common/fullcalendar/lang/hu.min.js" />
+        <item url="file://$PROJECT_DIR$/x_component_cms_ApplicationManager/lp/zh-cn.min.js" />
         <item url="file://$PROJECT_DIR$/x_desktop/res/framework/ace/src/mode-applescript.min.js" />
         <item url="file://$PROJECT_DIR$/x_desktop/res/framework/ace/src/keybinding-emacs.min.js" />
+        <item url="file://$PROJECT_DIR$/x_component_Execution/WorkGather-bak.min.js" />
         <item url="file://$PROJECT_DIR$/x_desktop/res/framework/ace/src/mode-apache_conf.min.js" />
         <item url="file://$PROJECT_DIR$/x_desktop/res/framework/ace/src/theme-sqlserver.min.js" />
         <item url="file://$PROJECT_DIR$/x_desktop/res/framework/ace/src/mode-typescript.min.js" />
@@ -4136,10 +4152,47 @@
       <root url="file://$PROJECT_DIR$/x_component_Forum/Login.min.js" />
       <root url="file://$PROJECT_DIR$/x_component_cms_FormDesigner/Module/View.min.js" />
       <root url="file://$PROJECT_DIR$/x_component_cms_FormDesigner/Module/View.min.js" />
-      <root url="file://$PROJECT_DIR$/x_component_Execution/WorkGather-bak.min.js" />
       <root url="file://$PROJECT_DIR$/x_component_Execution/CenterWorkDeployer.min.js" />
-      <root url="file://$PROJECT_DIR$/x_component_Execution/WorkGather-bak.min.js" />
       <root url="file://$PROJECT_DIR$/x_component_Execution/CenterWorkDeployer.min.js" />
+      <root url="file://$PROJECT_DIR$/x_component_cms_ColumnManager_bak/Actions/RestActions.min.js" />
+      <root url="file://$PROJECT_DIR$/x_component_cms_ColumnManager_bak/lp/zh-cn.min.js" />
+      <root url="file://$PROJECT_DIR$/x_component_cms_ColumnManager_bak/CategoryExplorerV2.min.js" />
+      <root url="file://$PROJECT_DIR$/x_component_cms_ColumnManager_bak/RestActions.min.js" />
+      <root url="file://$PROJECT_DIR$/x_component_cms_ColumnManager_bak/ViewExplorer.min.js" />
+      <root url="file://$PROJECT_DIR$/x_component_cms_ColumnManager_bak/CategoryExplorer.min.js" />
+      <root url="file://$PROJECT_DIR$/x_component_cms_ColumnManager_bak/ScriptExplorer.min.js" />
+      <root url="file://$PROJECT_DIR$/x_component_cms_ColumnManager_bak/Main.min.js" />
+      <root url="file://$PROJECT_DIR$/x_component_cms_ColumnManager_bak/QueryViewExplorer.min.js" />
+      <root url="file://$PROJECT_DIR$/x_component_cms_ColumnManager_bak/Explorer.min.js" />
+      <root url="file://$PROJECT_DIR$/x_component_cms_ColumnManager_bak/package.min.js" />
+      <root url="file://$PROJECT_DIR$/x_component_cms_ColumnManager_bak/DictionaryExplorer.min.js" />
+      <root url="file://$PROJECT_DIR$/x_component_cms_ColumnManager_bak/FormExplorer.min.js" />
+      <root url="file://$PROJECT_DIR$/x_component_cms_ColumnManager_bak/Actions/RestActions.min.js" />
+      <root url="file://$PROJECT_DIR$/x_component_cms_ColumnManager_bak/lp/zh-cn.min.js" />
+      <root url="file://$PROJECT_DIR$/x_component_cms_ColumnManager_bak/CategoryExplorerV2.min.js" />
+      <root url="file://$PROJECT_DIR$/x_component_cms_ColumnManager_bak/RestActions.min.js" />
+      <root url="file://$PROJECT_DIR$/x_component_cms_ColumnManager_bak/ViewExplorer.min.js" />
+      <root url="file://$PROJECT_DIR$/x_component_cms_ColumnManager_bak/CategoryExplorer.min.js" />
+      <root url="file://$PROJECT_DIR$/x_component_cms_ColumnManager_bak/ScriptExplorer.min.js" />
+      <root url="file://$PROJECT_DIR$/x_component_cms_ColumnManager_bak/Main.min.js" />
+      <root url="file://$PROJECT_DIR$/x_component_cms_ColumnManager_bak/QueryViewExplorer.min.js" />
+      <root url="file://$PROJECT_DIR$/x_component_cms_ColumnManager_bak/Explorer.min.js" />
+      <root url="file://$PROJECT_DIR$/x_component_cms_ColumnManager_bak/package.min.js" />
+      <root url="file://$PROJECT_DIR$/x_component_cms_ColumnManager_bak/DictionaryExplorer.min.js" />
+      <root url="file://$PROJECT_DIR$/x_component_cms_ColumnManager_bak/FormExplorer.min.js" />
+      <root url="file://$PROJECT_DIR$/x_component_cms_ColumnManager_bak2/Actions/RestActions.min.js" />
+      <root url="file://$PROJECT_DIR$/x_component_cms_ColumnManager_bak2/lp/zh-cn.min.js" />
+      <root url="file://$PROJECT_DIR$/x_component_cms_ColumnManager_bak2/CategoryExplorerV2.min.js" />
+      <root url="file://$PROJECT_DIR$/x_component_cms_ColumnManager_bak2/RestActions.min.js" />
+      <root url="file://$PROJECT_DIR$/x_component_cms_ColumnManager_bak2/ViewExplorer.min.js" />
+      <root url="file://$PROJECT_DIR$/x_component_cms_ColumnManager_bak2/CategoryExplorer.min.js" />
+      <root url="file://$PROJECT_DIR$/x_component_cms_ColumnManager_bak2/ScriptExplorer.min.js" />
+      <root url="file://$PROJECT_DIR$/x_component_cms_ColumnManager_bak2/Main.min.js" />
+      <root url="file://$PROJECT_DIR$/x_component_cms_ColumnManager_bak2/QueryViewExplorer.min.js" />
+      <root url="file://$PROJECT_DIR$/x_component_cms_ColumnManager_bak2/Explorer.min.js" />
+      <root url="file://$PROJECT_DIR$/x_component_cms_ColumnManager_bak2/package.min.js" />
+      <root url="file://$PROJECT_DIR$/x_component_cms_ColumnManager_bak2/DictionaryExplorer.min.js" />
+      <root url="file://$PROJECT_DIR$/x_component_cms_ColumnManager_bak2/FormExplorer.min.js" />
       <root url="file://$PROJECT_DIR$/x_desktop/res/framework/ace/src/ext-error_marker.min.js" />
       <root url="file://$PROJECT_DIR$/x_desktop/res/framework/ace/src/theme-merbivore.min.js" />
       <root url="file://$PROJECT_DIR$/x_desktop/res/framework/ace/src/mode-powershell.min.js" />
@@ -5311,24 +5364,15 @@
       <root url="file://$PROJECT_DIR$/x_component_File/AttachmentController.min.js" />
       <root url="file://$PROJECT_DIR$/x_desktop/res/framework/ace/src-min/snippets/cobol.min.js" />
       <root url="file://$PROJECT_DIR$/x_desktop/res/framework/htmleditor/ckeditor451/plugins/specialchar/dialogs/lang/et.min.js" />
-      <root url="file://$PROJECT_DIR$/x_component_cms_ColumnManager/CategoryExplorerV2.min.js" />
       <root url="file://$PROJECT_DIR$/x_desktop/res/framework/ace/src-min/snippets/toml.min.js" />
-      <root url="file://$PROJECT_DIR$/x_component_cms_ColumnManager/DictionaryExplorer.min.js" />
       <root url="file://$PROJECT_DIR$/x_desktop/res/framework/ace/src-min/snippets/sass.min.js" />
-      <root url="file://$PROJECT_DIR$/x_component_cms_ColumnManager/Main.min.js" />
       <root url="file://$PROJECT_DIR$/x_desktop/res/framework/ace/src-min/snippets/scss.min.js" />
-      <root url="file://$PROJECT_DIR$/x_component_cms_ColumnManager/Explorer.min.js" />
       <root url="file://$PROJECT_DIR$/x_desktop/res/framework/ace/src-min/snippets/scad.min.js" />
-      <root url="file://$PROJECT_DIR$/x_component_cms_ColumnManager/ViewExplorer.min.js" />
       <root url="file://$PROJECT_DIR$/x_desktop/res/framework/ace/src-min/snippets/text.min.js" />
-      <root url="file://$PROJECT_DIR$/x_component_cms_ColumnManager/package.min.js" />
       <root url="file://$PROJECT_DIR$/x_desktop/res/framework/ace/src-min/snippets/rust.min.js" />
       <root url="file://$PROJECT_DIR$/x_desktop/res/framework/htmleditor/ckeditor451/plugins/specialchar/dialogs/lang/es.min.js" />
-      <root url="file://$PROJECT_DIR$/x_component_cms_ColumnManager/ScriptExplorer.min.js" />
       <root url="file://$PROJECT_DIR$/x_desktop/res/framework/ace/src-min/snippets/rdoc.min.js" />
-      <root url="file://$PROJECT_DIR$/x_component_cms_ColumnManager/RestActions.min.js" />
       <root url="file://$PROJECT_DIR$/x_desktop/res/framework/ace/src-min/snippets/ruby.min.js" />
-      <root url="file://$PROJECT_DIR$/x_component_cms_ColumnManager/FormExplorer.min.js" />
       <root url="file://$PROJECT_DIR$/x_desktop/res/framework/ace/src-min/snippets/perl.min.js" />
       <root url="file://$PROJECT_DIR$/x_desktop/res/framework/ace/src-min/snippets/maze.min.js" />
       <root url="file://$PROJECT_DIR$/x_component_cms_DictionaryDesigner/Main.min.js" />
@@ -5953,7 +5997,6 @@
       <root url="file://$PROJECT_DIR$/x_desktop/res/framework/htmleditor/ckeditor/plugins/specialchar/dialogs/lang/ug.min.js" />
       <root url="file://$PROJECT_DIR$/x_component_Organization/Selector/package.min.js" />
       <root url="file://$PROJECT_DIR$/x_desktop/res/mwf4/package/widget/$SimpleEditor/default/ActionSetting.min.js" />
-      <root url="file://$PROJECT_DIR$/x_component_cms_ColumnManager/lp/zh-cn.min.js" />
       <root url="file://$PROJECT_DIR$/x_desktop/res/framework/ace/src-min-noconflict/mode-json.min.js" />
       <root url="file://$PROJECT_DIR$/x_desktop/res/framework/htmleditor/ckeditor/plugins/specialchar/dialogs/lang/zh.min.js" />
       <root url="file://$PROJECT_DIR$/x_desktop/res/framework/ace/src-min-noconflict/mode-haml.min.js" />
@@ -5963,12 +6006,11 @@
       <root url="file://$PROJECT_DIR$/x_desktop/res/framework/htmleditor/ckeditor/plugins/specialchar/dialogs/lang/th.min.js" />
       <root url="file://$PROJECT_DIR$/x_desktop/res/framework/htmleditor/ckeditor/plugins/specialchar/dialogs/lang/sk.min.js" />
       <root url="file://$PROJECT_DIR$/x_desktop/res/framework/ace/src-min-noconflict/mode-dart.min.js" />
-      <root url="file://$PROJECT_DIR$/x_component_cms_ColumnManager/Actions/RestActions.min.js" />
       <root url="file://$PROJECT_DIR$/x_desktop/res/framework/ace/src-min-noconflict/ext-emmet.min.js" />
       <root url="file://$PROJECT_DIR$/x_desktop/res/framework/htmleditor/ckeditor/plugins/specialchar/dialogs/lang/sv.min.js" />
       <root url="file://$PROJECT_DIR$/x_component_Selector/Actions/RestActions.min.js" />
-      <root url="file://$PROJECT_DIR$/x_desktop/res/mwf4/package/widget/$SimpleEditor/Actions/Emotion.min.js" />
       <root url="file://$PROJECT_DIR$/x_desktop/res/framework/ace/src-min-noconflict/mode-abap.min.js" />
+      <root url="file://$PROJECT_DIR$/x_desktop/res/mwf4/package/widget/$SimpleEditor/Actions/Emotion.min.js" />
       <root url="file://$PROJECT_DIR$/x_desktop/res/mwf4/package/widget/$SimpleEditor/Actions/Image.min.js" />
       <root url="file://$PROJECT_DIR$/x_desktop/res/framework/htmleditor/ckeditor/plugins/specialchar/dialogs/lang/sq.min.js" />
       <root url="file://$PROJECT_DIR$/x_component_Deployment/lp/zh-cn.min.js" />
@@ -6456,7 +6498,6 @@
       <root url="file://$PROJECT_DIR$/x_desktop/res/framework/ace/src-min/worker-xquery.min.js" />
       <root url="file://$PROJECT_DIR$/x_desktop/res/framework/ace/src-noconflict/mode-less.min.js" />
       <root url="file://$PROJECT_DIR$/x_desktop/res/framework/kityminder/editor/ui/dialog/image/image.ctrl.min.js" />
-      <root url="file://$PROJECT_DIR$/x_component_cms_ColumnManager/CategoryExplorer.min.js" />
       <root url="file://$PROJECT_DIR$/x_desktop/res/framework/htmleditor/tinymce/plugins/importcss/plugin.min.js" />
       <root url="file://$PROJECT_DIR$/x_desktop/res/framework/ace/src-noconflict/mode-json.min.js" />
       <root url="file://$PROJECT_DIR$/x_desktop/res/framework/htmleditor/tinymce/plugins/pagebreak/plugin.min.js" />
@@ -6596,6 +6637,7 @@
       <root url="file://$PROJECT_DIR$/x_desktop/res/framework/ace/src-noconflict/mode-ini.min.js" />
       <root url="file://$PROJECT_DIR$/x_component_Attendance/BDMarkerTool.min.js" />
       <root url="file://$PROJECT_DIR$/x_desktop/res/framework/ace/src-noconflict/mode-elm.min.js" />
+      <root url="file://$PROJECT_DIR$/x_component_cms_ColumnManager/Main.min.js" />
       <root url="file://$PROJECT_DIR$/x_desktop/res/framework/ace/src-noconflict/mode-css.min.js" />
       <root url="file://$PROJECT_DIR$/x_desktop/res/framework/ace/src-noconflict/mode-sh.min.js" />
       <root url="file://$PROJECT_DIR$/x_desktop/res/framework/ace/src-noconflict/mode-dot.min.js" />
@@ -6782,8 +6824,15 @@
       <root url="file://$PROJECT_DIR$/x_desktop/res/framework/ace/src-min/mode-praat.min.js" />
       <root url="file://$PROJECT_DIR$/x_desktop/res/framework/ace/src-min/mode-pgsql.min.js" />
       <root url="file://$PROJECT_DIR$/x_desktop/res/framework/ace/src-min/mode-space.min.js" />
+      <root url="file://$PROJECT_DIR$/x_component_cms_ApplicationManager/DictionaryExplorer.min.js" />
+      <root url="file://$PROJECT_DIR$/x_component_cms_ApplicationManager/QueryViewExplorer.min.js" />
+      <root url="file://$PROJECT_DIR$/x_component_cms_ApplicationManager/CategoryExplorer.min.js" />
+      <root url="file://$PROJECT_DIR$/x_component_cms_ApplicationManager/ScriptExplorer.min.js" />
       <root url="file://$PROJECT_DIR$/x_desktop/res/framework/ace/src-min/mode-latex.min.js" />
+      <root url="file://$PROJECT_DIR$/x_component_cms_ApplicationManager/ViewExplorer.min.js" />
+      <root url="file://$PROJECT_DIR$/x_component_cms_ApplicationManager/FormExplorer.min.js" />
       <root url="file://$PROJECT_DIR$/x_desktop/res/framework/ace/src-min/mode-mysql.min.js" />
+      <root url="file://$PROJECT_DIR$/x_component_cms_ApplicationManager/RestActions.min.js" />
       <root url="file://$PROJECT_DIR$/x_desktop/res/framework/ace/src-min/mode-ocaml.min.js" />
       <root url="file://$PROJECT_DIR$/x_desktop/res/framework/ace/src-min/mode-julia.min.js" />
       <root url="file://$PROJECT_DIR$/x_desktop/res/framework/ace/src-min/mode-curly.min.js" />
@@ -6845,10 +6894,12 @@
       <root url="file://$PROJECT_DIR$/x_component_cms_FormDesigner/lp/zh-cn.min.js" />
       <root url="file://$PROJECT_DIR$/x_component_Selector/Group.min.js" />
       <root url="file://$PROJECT_DIR$/x_component_Selector/Identity.min.js" />
+      <root url="file://$PROJECT_DIR$/x_component_cms_ColumnManager/lp/zh-cn.min.js" />
       <root url="file://$PROJECT_DIR$/x_component_Selector/Role.min.js" />
       <root url="file://$PROJECT_DIR$/x_component_Selector/Person.min.js" />
       <root url="file://$PROJECT_DIR$/x_component_Selector/Department.min.js" />
       <root url="file://$PROJECT_DIR$/x_component_Selector/package.min.js" />
+      <root url="file://$PROJECT_DIR$/x_component_cms_ColumnManager/Actions/RestActions.min.js" />
       <root url="file://$PROJECT_DIR$/x_component_Selector/Company.min.js" />
       <root url="file://$PROJECT_DIR$/x_component_ScriptEditor/Main.min.js" />
       <root url="file://$PROJECT_DIR$/x_component_cms_FormDesigner/Module/Textfield.min.js" />
@@ -6864,8 +6915,10 @@
       <root url="file://$PROJECT_DIR$/x_component_Organization/Selector/FormField.min.js" />
       <root url="file://$PROJECT_DIR$/x_component_Organization/Selector/CMSApplication.min.js" />
       <root url="file://$PROJECT_DIR$/x_component_process_ProcessDesigner/widget/PersonSelector_bak.min.js" />
+      <root url="file://$PROJECT_DIR$/x_component_cms_ApplicationManager/Explorer.min.js" />
+      <root url="file://$PROJECT_DIR$/x_component_cms_ApplicationManager/package.min.js" />
+      <root url="file://$PROJECT_DIR$/x_component_cms_ApplicationManager/Main.min.js" />
       <root url="file://$PROJECT_DIR$/x_component_cms_FormDesigner/Module/Image.min.js" />
-      <root url="file://$PROJECT_DIR$/x_component_cms_ColumnManager/QueryViewExplorer.min.js" />
       <root url="file://$PROJECT_DIR$/x_desktop/res/framework/ace/src-min/mode-glsl.min.js" />
       <root url="file://$PROJECT_DIR$/x_desktop/res/framework/ace/src-min/mode-dart.min.js" />
       <root url="file://$PROJECT_DIR$/x_desktop/res/framework/ace/src-min/mode-diff.min.js" />
@@ -6905,14 +6958,18 @@
       <root url="file://$PROJECT_DIR$/x_desktop/res/framework/ace/src-min/mode-sql.min.js" />
       <root url="file://$PROJECT_DIR$/x_desktop/res/framework/ace/src-min/mode-sjs.min.js" />
       <root url="file://$PROJECT_DIR$/x_desktop/res/framework/ace/src-min/mode-mel.min.js" />
+      <root url="file://$PROJECT_DIR$/x_component_Attendance/$Common/echarts/echarts.common.min.js" />
       <root url="file://$PROJECT_DIR$/x_desktop/res/framework/ace/src-min/mode-nix.min.js" />
       <root url="file://$PROJECT_DIR$/x_desktop/res/framework/ace/src-min/mode-lua.min.js" />
       <root url="file://$PROJECT_DIR$/x_component_Attendance/$Common/fullcalendar/fullcalendar.min.js" />
       <root url="file://$PROJECT_DIR$/x_desktop/res/framework/ace/src-min/mode-jsx.min.js" />
       <root url="file://$PROJECT_DIR$/x_component_cms_FormDesigner/Module/Datagrid.min.js" />
       <root url="file://$PROJECT_DIR$/x_component_cms_FormDesigner/Module/Tab.min.js" />
+      <root url="file://$PROJECT_DIR$/x_component_Attendance/$Common/fullcalendar/lib/moment.min.js" />
       <root url="file://$PROJECT_DIR$/x_desktop/res/mwf4/package/xScript/Actions/DictActions.min.js" />
       <root url="file://$PROJECT_DIR$/x_desktop/res/framework/ace/src-min/mode-lsl.min.js" />
+      <root url="file://$PROJECT_DIR$/x_component_Attendance/$Common/fullcalendar/lib/jquery-ui.custom.min.js" />
+      <root url="file://$PROJECT_DIR$/x_component_Attendance/$Common/fullcalendar/lib/jquery.min.js" />
       <root url="file://$PROJECT_DIR$/x_desktop/res/mwf4/package/xScript/Actions/CMSScriptActions.min.js" />
       <root url="file://$PROJECT_DIR$/x_desktop/res/framework/ace/src-min/mode-jsp.min.js" />
       <root url="file://$PROJECT_DIR$/x_desktop/res/mwf4/package/xScript/Actions/ScriptActions.min.js" />
@@ -6935,8 +6992,8 @@
       <root url="file://$PROJECT_DIR$/x_component_Attendance/$Common/fullcalendar/lang/en-gb.min.js" />
       <root url="file://$PROJECT_DIR$/x_component_Attendance/$Common/fullcalendar/lang/ca.min.js" />
       <root url="file://$PROJECT_DIR$/x_component_Attendance/$Common/fullcalendar/lang/ar.min.js" />
-      <root url="file://$PROJECT_DIR$/x_component_Attendance/$Common/fullcalendar/lang/zh-cn.min.js" />
       <root url="file://$PROJECT_DIR$/x_desktop/res/framework/ace/src-min/mode-elm.min.js" />
+      <root url="file://$PROJECT_DIR$/x_component_Attendance/$Common/fullcalendar/lang/zh-cn.min.js" />
       <root url="file://$PROJECT_DIR$/x_desktop/res/framework/htmleditor/ckeditor/plugins/specialchar/dialogs/specialchar.min.js" />
       <root url="file://$PROJECT_DIR$/x_desktop/res/framework/ace/src-min/mode-ejs.min.js" />
       <root url="file://$PROJECT_DIR$/x_component_Attendance/$Common/fullcalendar/lang/uk.min.js" />
@@ -6971,12 +7028,22 @@
       <root url="file://$PROJECT_DIR$/x_desktop/res/framework/ace/src/theme-tomorrow_night.min.js" />
       <root url="file://$PROJECT_DIR$/x_desktop/res/framework/ace/src/theme-pastel_on_dark.min.js" />
       <root url="file://$PROJECT_DIR$/x_desktop/res/framework/ace/src/ext-static_highlight.min.js" />
+      <root url="file://$PROJECT_DIR$/x_component_cms_ColumnManager/package.min.js" />
+      <root url="file://$PROJECT_DIR$/x_component_cms_ColumnManager/ScriptExplorer.min.js" />
+      <root url="file://$PROJECT_DIR$/x_component_cms_ColumnManager/QueryViewExplorer.min.js" />
+      <root url="file://$PROJECT_DIR$/x_component_cms_ColumnManager/RestActions.min.js" />
+      <root url="file://$PROJECT_DIR$/x_component_cms_ColumnManager/FormExplorer.min.js" />
+      <root url="file://$PROJECT_DIR$/x_component_cms_ColumnManager/ViewExplorer.min.js" />
+      <root url="file://$PROJECT_DIR$/x_component_cms_ColumnManager/Explorer.min.js" />
+      <root url="file://$PROJECT_DIR$/x_component_cms_ColumnManager/CategoryExplorer.min.js" />
+      <root url="file://$PROJECT_DIR$/x_component_cms_ColumnManager/DictionaryExplorer.min.js" />
       <root url="file://$PROJECT_DIR$/x_desktop/res/framework/ace/src/theme-crimson_editor.min.js" />
       <root url="file://$PROJECT_DIR$/x_desktop/res/framework/ace/src/theme-merbivore_soft.min.js" />
       <root url="file://$PROJECT_DIR$/x_desktop/res/framework/ace/src/ext-keybinding_menu.min.js" />
       <root url="file://$PROJECT_DIR$/x_desktop/res/framework/ace/src/mode-mips_assembler.min.js" />
       <root url="file://$PROJECT_DIR$/x_desktop/res/framework/ace/src/ext-language_tools.min.js" />
       <root url="file://$PROJECT_DIR$/x_desktop/res/framework/ace/src/mode-mipsassembler.min.js" />
+      <root url="file://$PROJECT_DIR$/x_component_cms_ApplicationManager/Actions/RestActions.min.js" />
       <root url="file://$PROJECT_DIR$/x_desktop/res/framework/ace/src/theme-idle_fingers.min.js" />
       <root url="file://$PROJECT_DIR$/x_desktop/res/framework/ace/src/mode-soy_template.min.js" />
       <root url="file://$PROJECT_DIR$/x_desktop/res/framework/ace/src/theme-katzenmilch.min.js" />
@@ -6987,8 +7054,8 @@
       <root url="file://$PROJECT_DIR$/x_component_Attendance/$Common/fullcalendar/lang/en-ie.min.js" />
       <root url="file://$PROJECT_DIR$/x_component_Attendance/$Common/fullcalendar/lang/zh-tw.min.js" />
       <root url="file://$PROJECT_DIR$/x_component_Attendance/$Common/fullcalendar/lang/ar-tn.min.js" />
-      <root url="file://$PROJECT_DIR$/x_desktop/res/framework/ace/src/mode-actionscript.min.js" />
       <root url="file://$PROJECT_DIR$/x_component_Attendance/$Common/fullcalendar/lang/nb.min.js" />
+      <root url="file://$PROJECT_DIR$/x_desktop/res/framework/ace/src/mode-actionscript.min.js" />
       <root url="file://$PROJECT_DIR$/x_component_Attendance/$Common/fullcalendar/lang/fr-ca.min.js" />
       <root url="file://$PROJECT_DIR$/x_component_Attendance/$Common/fullcalendar/lang/he.min.js" />
       <root url="file://$PROJECT_DIR$/x_desktop/res/framework/ace/src/ext-settings_menu.min.js" />
@@ -7002,8 +7069,10 @@
       <root url="file://$PROJECT_DIR$/x_component_Attendance/$Common/fullcalendar/lang/nl.min.js" />
       <root url="file://$PROJECT_DIR$/x_component_Attendance/$Common/fullcalendar/lang/ro.min.js" />
       <root url="file://$PROJECT_DIR$/x_component_Attendance/$Common/fullcalendar/lang/hu.min.js" />
+      <root url="file://$PROJECT_DIR$/x_component_cms_ApplicationManager/lp/zh-cn.min.js" />
       <root url="file://$PROJECT_DIR$/x_desktop/res/framework/ace/src/mode-applescript.min.js" />
       <root url="file://$PROJECT_DIR$/x_desktop/res/framework/ace/src/keybinding-emacs.min.js" />
+      <root url="file://$PROJECT_DIR$/x_component_Execution/WorkGather-bak.min.js" />
       <root url="file://$PROJECT_DIR$/x_desktop/res/framework/ace/src/mode-apache_conf.min.js" />
       <root url="file://$PROJECT_DIR$/x_desktop/res/framework/ace/src/theme-sqlserver.min.js" />
       <root url="file://$PROJECT_DIR$/x_desktop/res/framework/ace/src/mode-typescript.min.js" />

x_desktop_web/.idea/vcs.xml

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$/.." vcs="Git" />
     <mapping directory="$PROJECT_DIR$" vcs="svn" />
   </component>
 </project>

x_desktop_web/.idea/workspace.xml

@@ -2,6 +2,389 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" readonly="true" id="0047d22c-6d8e-4857-9099-141a70138b96" name="默认的" comment="">
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$CategoryExplorer" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$Explorer" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$Main" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/Actions" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$CategoryExplorer/default/icon/add.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$CategoryExplorer/default/categoryIcon/addProcess.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$Explorer/default/categoryIcon/addProcess.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$CategoryExplorer/default/categoryIcon/addProcess_gray.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$Explorer/default/categoryIcon/addProcess_gray.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$CategoryExplorer/default/categoryIcon/addToDeskTop.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$Explorer/default/categoryIcon/addToDeskTop.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$CategoryExplorer/default/icon/add_blue.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$Main/appicon.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$CategoryExplorer/default/icon/cancel.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$CategoryExplorer/default/icon/cancel_over.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$CategoryExplorer/default/categoryIcon" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$Explorer/default/categoryIcon" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$CategoryExplorer/default/icon/category_add.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$CategoryExplorer/default/icon/category_add_gray.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$CategoryExplorer/default/icon/category_delete.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$CategoryExplorer/default/icon/category_delete_gray.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$CategoryExplorer/default/icon/checkmark.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$Explorer/default/icon/checkmark.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$CategoryExplorer/default/icon/checkmark_selected.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$Explorer/default/icon/checkmark_selected.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$CategoryExplorer/default/icon/checkmark_selected2.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$Explorer/default/icon/checkmark_selected2.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$CategoryExplorer/default/categoryIcon/collapse.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$Explorer/default/categoryIcon/collapse.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$CategoryExplorer/default/categoryIcon/createCategory.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$CategoryExplorer/default/icon/createCategory.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$Explorer/default/categoryIcon/createCategory.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$Explorer/default/icon/createProcess.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$CategoryExplorer/default" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$Explorer/default" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$Main/default" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$CategoryExplorer/default/icon/delete.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$Explorer/default/icon/delete.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$CategoryExplorer/default/categoryIcon/deleteCategory.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$CategoryExplorer/default/icon/deleteCategory.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$Explorer/default/categoryIcon/deleteCategory.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$CategoryExplorer/default/categoryIcon/deleteCategory_gray.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$Explorer/default/categoryIcon/deleteCategory_gray.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$CategoryExplorer/default/icon/deleteCategory_red.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$CategoryExplorer/default/icon/deleteCategory_red1.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$CategoryExplorer/default/processIcon/deleteProcess.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$Explorer/default/processIcon/deleteProcess.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$Explorer/full/processIcon/deleteProcess.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$Explorer/default/processIcon/deleteProcess_red.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$Explorer/full/processIcon/deleteProcess_red.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$Explorer/default/processIcon/deleteProcess_red1.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$Explorer/full/processIcon/deleteProcess_red1.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$CategoryExplorer/default/icon/deleteRow1.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$Explorer/default/dictionaryIcon" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$Explorer/full/dictionaryIcon" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$CategoryExplorer/default/icon/edit.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$Main/default/icon/edit.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$CategoryExplorer/default/categoryIcon/editCancel.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$Explorer/default/categoryIcon/editCancel.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$Main/default/icon/editCancel.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$CategoryExplorer/default/categoryIcon/editCancel_bg.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$CategoryExplorer/default/icon/editCancel_bg.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$Explorer/default/categoryIcon/editCancel_bg.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$CategoryExplorer/default/categoryIcon/editCategory.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$Explorer/default/categoryIcon/editCategory.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$CategoryExplorer/default/categoryIcon/editCategory_gray.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$Explorer/default/categoryIcon/editCategory_gray.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$CategoryExplorer/default/categoryIcon/editOk.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$Explorer/default/categoryIcon/editOk.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$Main/default/icon/editOk.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$CategoryExplorer/default/categoryIcon/editOk_bg.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$CategoryExplorer/default/icon/editOk_bg.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$Explorer/default/categoryIcon/editOk_bg.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$CategoryExplorer/default/categoryIcon/editOk_gray.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$Explorer/default/categoryIcon/editOk_gray.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$CategoryExplorer/default/processIcon/editProcess.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$Explorer/default/processIcon/editProcess.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$Explorer/full/processIcon/editProcess.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$CategoryExplorer/default/icon/edit_over.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$Explorer/default/icon/error.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$CategoryExplorer/default/categoryIcon/expand.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$Explorer/default/categoryIcon/expand.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$CategoryExplorer/default/icon/eye.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$Explorer/default/icon/eye.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$CategoryExplorer/default/icon/eye_selected.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$Explorer/default/icon/eye_selected.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$Explorer/default/icon/form.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$Explorer/default/processIcon/form.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$Explorer/full/processIcon/form.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$Explorer/default/formIcon" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$Explorer/full/formIcon" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$Explorer/full" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$CategoryExplorer/default/icon/home.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$CategoryExplorer/default/icon/home_selected.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$Main/default/icon.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$CategoryExplorer/default/categoryIcon/icon1.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$Explorer/default/categoryIcon/icon1.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$CategoryExplorer/default/categoryIcon/icon10.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$Explorer/default/categoryIcon/icon10.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$CategoryExplorer/default/categoryIcon/icon10_light.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$Explorer/default/categoryIcon/icon10_light.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$CategoryExplorer/default/categoryIcon/icon11.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$Explorer/default/categoryIcon/icon11.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$CategoryExplorer/default/categoryIcon/icon11_light.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$Explorer/default/categoryIcon/icon11_light.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$CategoryExplorer/default/categoryIcon/icon1_light.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$Explorer/default/categoryIcon/icon1_light.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$CategoryExplorer/default/categoryIcon/icon2.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$Explorer/default/categoryIcon/icon2.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$CategoryExplorer/default/categoryIcon/icon2_light.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$Explorer/default/categoryIcon/icon2_light.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$CategoryExplorer/default/categoryIcon/icon3.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$Explorer/default/categoryIcon/icon3.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$CategoryExplorer/default/categoryIcon/icon3_light.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$Explorer/default/categoryIcon/icon3_light.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$CategoryExplorer/default/categoryIcon/icon4.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$Explorer/default/categoryIcon/icon4.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$CategoryExplorer/default/categoryIcon/icon4_light.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$Explorer/default/categoryIcon/icon4_light.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$CategoryExplorer/default/categoryIcon/icon5.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$Explorer/default/categoryIcon/icon5.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$CategoryExplorer/default/categoryIcon/icon5_light.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$Explorer/default/categoryIcon/icon5_light.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$CategoryExplorer/default/categoryIcon/icon6.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$Explorer/default/categoryIcon/icon6.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$CategoryExplorer/default/categoryIcon/icon6_light.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$Explorer/default/categoryIcon/icon6_light.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$CategoryExplorer/default/categoryIcon/icon7.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$Explorer/default/categoryIcon/icon7.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$CategoryExplorer/default/categoryIcon/icon7_light.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$Explorer/default/categoryIcon/icon7_light.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$CategoryExplorer/default/categoryIcon/icon8.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$Explorer/default/categoryIcon/icon8.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$CategoryExplorer/default/categoryIcon/icon8_light.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$Explorer/default/categoryIcon/icon8_light.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$CategoryExplorer/default/categoryIcon/icon9.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$Explorer/default/categoryIcon/icon9.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$CategoryExplorer/default/categoryIcon/icon9_light.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$Explorer/default/categoryIcon/icon9_light.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$CategoryExplorer/default/icon" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$Explorer/default/icon" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$Main/default/icon" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$Main/default/icon/icon_additional.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$Main/default/icon/icon_additional_click.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$Main/default/icon/icon_bian_ji_lie_biao.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$Main/default/icon/icon_bian_ji_lie_biao_click.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$Main/default/icon/icon_biao_dan_pei_zhi.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$Main/default/icon/icon_biao_dan_pei_zhi_click.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$Main/default/icon/icon_delete_blue_click.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$Main/default/icon/icon_delete_grey.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$Main/default/icon/icon_down2.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$Main/default/icon/icon_down2_click.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$Main/default/icon/icon_edit.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$Main/default/icon/icon_edit_click.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$Main/default/icon/icon_edit_form.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$Main/default/icon/icon_edit_form_blue_click.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$Main/default/icon/icon_fen_lei.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$Main/default/icon/icon_fen_lei_click.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$Main/default/icon/icon_insert.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$Main/default/icon/icon_insert_click.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$Main/default/icon/icon_jiao_ben.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$Main/default/icon/icon_jiao_ben_click.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$Main/default/icon/icon_lan_mu.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$Main/default/icon/icon_lan_mu_click.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$Main/default/icon/icon_lie_biao.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$Main/default/icon/icon_lie_biao_click.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$Main/default/icon/icon_mo_ren_lie_biao.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$Main/default/icon/icon_mo_ren_lie_biao_click.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$Main/default/icon/icon_read.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$Main/default/icon/icon_read_click.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$Main/default/icon/icon_shu_ju_pei_zhi.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$Main/default/icon/icon_shu_ju_pei_zhi_click.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$Main/default/icon/icon_shu_ju_shi_tu.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$Main/default/icon/icon_shu_ju_shi_tu_click.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$Main/default/icon/icon_turn.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$Main/default/icon/icon_turn_click.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$CategoryExplorer/default/icon/insertAfter.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$CategoryExplorer/default/icon/insertAfter_over.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$CategoryExplorer/default/icon/insertBefore.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$CategoryExplorer/default/icon/insertBefore_over.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$CategoryExplorer/default/icon/insertColAfter.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$CategoryExplorer/default/icon/insertColBefore.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$CategoryExplorer/default/icon/insertRow1.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$Main/default/icon/list_view.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$CategoryExplorer/default/categoryIcon/lnk.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$CategoryExplorer/default/processIcon/lnk.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$Explorer/default/categoryIcon/lnk.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$Explorer/default/dictionaryIcon/lnk.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$Explorer/default/formIcon/lnk.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$Explorer/default/processIcon/lnk.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$Explorer/default/queryViewIcon/lnk.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$Explorer/default/scriptIcon/lnk.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$Explorer/default/viewIcon/lnk.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$Explorer/full/dictionaryIcon/lnk.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$Explorer/full/formIcon/lnk.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$Explorer/full/processIcon/lnk.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$Explorer/full/queryViewIcon/lnk.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$Explorer/full/scriptIcon/lnk.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$Explorer/full/viewIcon/lnk.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$CategoryExplorer/default/categoryIcon/lnk2.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$Explorer/default/categoryIcon/lnk2.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$Explorer/default/categoryIcon/lnk_form.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/lp" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$CategoryExplorer/default/icon/move1.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$CategoryExplorer/default/categoryIcon/new.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$CategoryExplorer/default/icon/new.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$Explorer/default/categoryIcon/new.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$Explorer/default/icon/new.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$CategoryExplorer/default/categoryIcon/newCategory.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$Explorer/default/categoryIcon/newCategory.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$CategoryExplorer/default/icon/newForm.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$CategoryExplorer/default/icon/newList.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$CategoryExplorer/default/icon/plus.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$Main/default/icon/plus.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$Main/default/icon/plus2.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$CategoryExplorer/default/icon/plus_over.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$Main/default/icon/plus_over.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$CategoryExplorer/default/processIcon" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$Explorer/default/processIcon" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$Explorer/full/processIcon" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$Main/default/icon/process_data.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$Main/default/icon/process_flow.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$Main/default/icon/process_form.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$CategoryExplorer/default/processIcon/process_icon_0.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$Explorer/default/processIcon/process_icon_0.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$Explorer/full/processIcon/process_icon_0.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$CategoryExplorer/default/processIcon/process_icon_1.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$Explorer/default/processIcon/process_icon_1.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$Explorer/full/processIcon/process_icon_1.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$CategoryExplorer/default/processIcon/process_icon_10.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$Explorer/default/processIcon/process_icon_10.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$Explorer/full/processIcon/process_icon_10.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$CategoryExplorer/default/processIcon/process_icon_11.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$Explorer/default/processIcon/process_icon_11.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$Explorer/full/processIcon/process_icon_11.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$CategoryExplorer/default/processIcon/process_icon_12.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$Explorer/default/processIcon/process_icon_12.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$Explorer/full/processIcon/process_icon_12.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$CategoryExplorer/default/processIcon/process_icon_13.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$Explorer/default/processIcon/process_icon_13.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$Explorer/full/processIcon/process_icon_13.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$CategoryExplorer/default/processIcon/process_icon_14.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$Explorer/default/processIcon/process_icon_14.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$Explorer/full/processIcon/process_icon_14.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$CategoryExplorer/default/processIcon/process_icon_15.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$Explorer/default/processIcon/process_icon_15.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$Explorer/full/processIcon/process_icon_15.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$CategoryExplorer/default/processIcon/process_icon_16.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$Explorer/default/processIcon/process_icon_16.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$Explorer/full/processIcon/process_icon_16.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$CategoryExplorer/default/processIcon/process_icon_17.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$Explorer/default/processIcon/process_icon_17.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$Explorer/full/processIcon/process_icon_17.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$CategoryExplorer/default/processIcon/process_icon_18.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$Explorer/default/processIcon/process_icon_18.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$Explorer/full/processIcon/process_icon_18.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$CategoryExplorer/default/processIcon/process_icon_19.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$Explorer/default/processIcon/process_icon_19.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$Explorer/full/processIcon/process_icon_19.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$CategoryExplorer/default/processIcon/process_icon_2.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$Explorer/default/processIcon/process_icon_2.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$Explorer/full/processIcon/process_icon_2.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$CategoryExplorer/default/processIcon/process_icon_20.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$Explorer/default/processIcon/process_icon_20.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$Explorer/full/processIcon/process_icon_20.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$CategoryExplorer/default/processIcon/process_icon_21.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$Explorer/default/processIcon/process_icon_21.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$Explorer/full/processIcon/process_icon_21.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$CategoryExplorer/default/processIcon/process_icon_22.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$Explorer/default/processIcon/process_icon_22.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$Explorer/full/processIcon/process_icon_22.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$CategoryExplorer/default/processIcon/process_icon_23.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$Explorer/default/processIcon/process_icon_23.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$Explorer/full/processIcon/process_icon_23.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$CategoryExplorer/default/processIcon/process_icon_24.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$Explorer/default/processIcon/process_icon_24.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$Explorer/full/processIcon/process_icon_24.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$CategoryExplorer/default/processIcon/process_icon_25.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$Explorer/default/processIcon/process_icon_25.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$Explorer/full/processIcon/process_icon_25.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$CategoryExplorer/default/processIcon/process_icon_26.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$Explorer/default/processIcon/process_icon_26.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$Explorer/full/processIcon/process_icon_26.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$CategoryExplorer/default/processIcon/process_icon_27.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$Explorer/default/processIcon/process_icon_27.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$Explorer/full/processIcon/process_icon_27.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$CategoryExplorer/default/processIcon/process_icon_28.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$Explorer/default/processIcon/process_icon_28.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$Explorer/full/processIcon/process_icon_28.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$CategoryExplorer/default/processIcon/process_icon_29.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$Explorer/default/processIcon/process_icon_29.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$Explorer/full/processIcon/process_icon_29.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$CategoryExplorer/default/processIcon/process_icon_3.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$Explorer/default/processIcon/process_icon_3.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$Explorer/full/processIcon/process_icon_3.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$CategoryExplorer/default/processIcon/process_icon_30.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$Explorer/default/processIcon/process_icon_30.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$Explorer/full/processIcon/process_icon_30.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$CategoryExplorer/default/processIcon/process_icon_31.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$Explorer/default/processIcon/process_icon_31.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$Explorer/full/processIcon/process_icon_31.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$CategoryExplorer/default/processIcon/process_icon_32.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$Explorer/default/processIcon/process_icon_32.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$Explorer/full/processIcon/process_icon_32.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$CategoryExplorer/default/processIcon/process_icon_4.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$Explorer/default/processIcon/process_icon_4.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$Explorer/full/processIcon/process_icon_4.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$CategoryExplorer/default/processIcon/process_icon_5.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$Explorer/default/processIcon/process_icon_5.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$Explorer/full/processIcon/process_icon_5.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$CategoryExplorer/default/processIcon/process_icon_6.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$Explorer/default/processIcon/process_icon_6.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$Explorer/full/processIcon/process_icon_6.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$CategoryExplorer/default/processIcon/process_icon_7.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$Explorer/default/processIcon/process_icon_7.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$Explorer/full/processIcon/process_icon_7.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$CategoryExplorer/default/processIcon/process_icon_8.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$Explorer/default/processIcon/process_icon_8.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$Explorer/full/processIcon/process_icon_8.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$CategoryExplorer/default/processIcon/process_icon_9.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$Explorer/default/processIcon/process_icon_9.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$Explorer/full/processIcon/process_icon_9.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$Main/default/icon/process_plugin.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$Main/default/icon/process_property.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$Main/default/icon/process_rule.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$Main/default/icon/process_script.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$Main/default/icon/process_view.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$Main/default/icon/process_view_bak.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$Explorer/default/queryViewIcon" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$Explorer/full/queryViewIcon" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$CategoryExplorer/default/icon/read.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$CategoryExplorer/default/icon/save.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$CategoryExplorer/default/icon/save_over.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$Explorer/default/scriptIcon" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$Explorer/full/scriptIcon" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$CategoryExplorer/default/icon/search.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$CategoryExplorer/default/categoryIcon/searchCategory.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$CategoryExplorer/default/icon/searchCategory.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$Explorer/default/categoryIcon/searchCategory.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$CategoryExplorer/default/icon/search_gray.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$CategoryExplorer/default/icon/trash.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$Explorer/default/icon/trash.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$CategoryExplorer/default/icon/trash_over.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$CategoryExplorer/default/icon/turn.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$CategoryExplorer/default/icon/turn_over.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$Explorer/default/viewIcon" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$Explorer/full/viewIcon" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$CategoryExplorer/default/icon/yes.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/CategoryExplorer.js" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/CategoryExplorer.min.js" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/DictionaryExplorer.js" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/DictionaryExplorer.min.js" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/Explorer.js" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/Explorer.min.js" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/FormExplorer.js" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/FormExplorer.min.js" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/Main.js" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/Main.min.js" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/QueryViewExplorer.js" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/QueryViewExplorer.min.js" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/RestActions.js" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/Actions/RestActions.js" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/RestActions.min.js" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/Actions/RestActions.min.js" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/ScriptExplorer.js" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/ScriptExplorer.min.js" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/ViewExplorer.js" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/ViewExplorer.min.js" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/Actions/action.json" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$CategoryExplorer/default/css.wcss" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$Explorer/default/css.wcss" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$Explorer/full/css.wcss" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$Main/default/css.wcss" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$CategoryExplorer/default/css_bak.wcss" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/package.js" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/package.min.js" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$CategoryExplorer/process.json" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$Explorer/process.json" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/$Main/startMenu.json" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/lp/zh-cn.js.bak" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/lp/zh-cn.js" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/x_component_cms_ApplicationManager/lp/zh-cn.min.js" />
       <change type="MODIFICATION" beforePath="D:\x\x_desktop_web\x_component_HotPicture\$Main\appicon.png" afterPath="D:\x\x_desktop_web\x_component_HotPicture\$Main\appicon.png" />
       <change type="MODIFICATION" beforePath="D:\x\x_desktop_web\x_component_HotPicture\$Main\bak\icon\bbs.png" afterPath="D:\x\x_desktop_web\x_component_HotPicture\$Main\bak\icon\bbs.png" />
       <change type="MODIFICATION" beforePath="D:\x\x_desktop_web\x_component_HotPicture\$Setting\default\icon\bbs.png" afterPath="D:\x\x_desktop_web\x_component_HotPicture\$Setting\default\icon\bbs.png" />
@@ -35,17 +418,82 @@
       <change type="MODIFICATION" beforePath="D:\x\x_desktop_web\x_component_HotPicture\$Setting\default\sectionIcon\icon7.png" afterPath="D:\x\x_desktop_web\x_component_HotPicture\$Setting\default\sectionIcon\icon7.png" />
       <change type="MODIFICATION" beforePath="D:\x\x_desktop_web\x_component_HotPicture\$Setting\default\sectionIcon\icon8.png" afterPath="D:\x\x_desktop_web\x_component_HotPicture\$Setting\default\sectionIcon\icon8.png" />
       <change type="MODIFICATION" beforePath="D:\x\x_desktop_web\x_component_HotPicture\$Setting\default\sectionIcon\icon9.png" afterPath="D:\x\x_desktop_web\x_component_HotPicture\$Setting\default\sectionIcon\icon9.png" />
+      <change type="MODIFICATION" beforePath="D:\x\x_desktop_web\x_component_cms_ColumnManagerV2\$Main\default\icon\icon_additional.png" afterPath="D:\x\x_desktop_web\x_component_cms_ColumnManagerV2\$Main\default\icon\icon_additional.png" />
+      <change type="MODIFICATION" beforePath="D:\x\x_desktop_web\x_component_cms_ColumnManagerV2\$Main\default\icon\icon_additional_click.png" afterPath="D:\x\x_desktop_web\x_component_cms_ColumnManagerV2\$Main\default\icon\icon_additional_click.png" />
+      <change type="MODIFICATION" beforePath="D:\x\x_desktop_web\x_component_cms_ColumnManagerV2\$Main\default\icon\icon_bian_ji_lie_biao.png" afterPath="D:\x\x_desktop_web\x_component_cms_ColumnManagerV2\$Main\default\icon\icon_bian_ji_lie_biao.png" />
+      <change type="MODIFICATION" beforePath="D:\x\x_desktop_web\x_component_cms_ColumnManagerV2\$Main\default\icon\icon_bian_ji_lie_biao_click.png" afterPath="D:\x\x_desktop_web\x_component_cms_ColumnManagerV2\$Main\default\icon\icon_bian_ji_lie_biao_click.png" />
+      <change type="MODIFICATION" beforePath="D:\x\x_desktop_web\x_component_cms_ColumnManagerV2\$Main\default\icon\icon_biao_dan_pei_zhi.png" afterPath="D:\x\x_desktop_web\x_component_cms_ColumnManagerV2\$Main\default\icon\icon_biao_dan_pei_zhi.png" />
+      <change type="MODIFICATION" beforePath="D:\x\x_desktop_web\x_component_cms_ColumnManagerV2\$Main\default\icon\icon_biao_dan_pei_zhi_click.png" afterPath="D:\x\x_desktop_web\x_component_cms_ColumnManagerV2\$Main\default\icon\icon_biao_dan_pei_zhi_click.png" />
+      <change type="MODIFICATION" beforePath="D:\x\x_desktop_web\x_component_cms_ColumnManagerV2\$Main\default\icon\icon_delete_blue_click.png" afterPath="D:\x\x_desktop_web\x_component_cms_ColumnManagerV2\$Main\default\icon\icon_delete_blue_click.png" />
+      <change type="MODIFICATION" beforePath="D:\x\x_desktop_web\x_component_cms_ColumnManagerV2\$Main\default\icon\icon_delete_grey.png" afterPath="D:\x\x_desktop_web\x_component_cms_ColumnManagerV2\$Main\default\icon\icon_delete_grey.png" />
+      <change type="MODIFICATION" beforePath="D:\x\x_desktop_web\x_component_cms_ColumnManagerV2\$Main\default\icon\icon_down2.png" afterPath="D:\x\x_desktop_web\x_component_cms_ColumnManagerV2\$Main\default\icon\icon_down2.png" />
+      <change type="MODIFICATION" beforePath="D:\x\x_desktop_web\x_component_cms_ColumnManagerV2\$Main\default\icon\icon_down2_click.png" afterPath="D:\x\x_desktop_web\x_component_cms_ColumnManagerV2\$Main\default\icon\icon_down2_click.png" />
+      <change type="MODIFICATION" beforePath="D:\x\x_desktop_web\x_component_cms_ColumnManagerV2\$Main\default\icon\icon_edit.png" afterPath="D:\x\x_desktop_web\x_component_cms_ColumnManagerV2\$Main\default\icon\icon_edit.png" />
+      <change type="MODIFICATION" beforePath="D:\x\x_desktop_web\x_component_cms_ColumnManagerV2\$Main\default\icon\icon_edit_click.png" afterPath="D:\x\x_desktop_web\x_component_cms_ColumnManagerV2\$Main\default\icon\icon_edit_click.png" />
+      <change type="MODIFICATION" beforePath="D:\x\x_desktop_web\x_component_cms_ColumnManagerV2\$Main\default\icon\icon_edit_form.png" afterPath="D:\x\x_desktop_web\x_component_cms_ColumnManagerV2\$Main\default\icon\icon_edit_form.png" />
+      <change type="MODIFICATION" beforePath="D:\x\x_desktop_web\x_component_cms_ColumnManagerV2\$Main\default\icon\icon_edit_form_blue_click.png" afterPath="D:\x\x_desktop_web\x_component_cms_ColumnManagerV2\$Main\default\icon\icon_edit_form_blue_click.png" />
+      <change type="MODIFICATION" beforePath="D:\x\x_desktop_web\x_component_cms_ColumnManagerV2\$Main\default\icon\icon_fen_lei.png" afterPath="D:\x\x_desktop_web\x_component_cms_ColumnManagerV2\$Main\default\icon\icon_fen_lei.png" />
+      <change type="MODIFICATION" beforePath="D:\x\x_desktop_web\x_component_cms_ColumnManagerV2\$Main\default\icon\icon_fen_lei_click.png" afterPath="D:\x\x_desktop_web\x_component_cms_ColumnManagerV2\$Main\default\icon\icon_fen_lei_click.png" />
+      <change type="MODIFICATION" beforePath="D:\x\x_desktop_web\x_component_cms_ColumnManagerV2\$Main\default\icon\icon_insert.png" afterPath="D:\x\x_desktop_web\x_component_cms_ColumnManagerV2\$Main\default\icon\icon_insert.png" />
+      <change type="MODIFICATION" beforePath="D:\x\x_desktop_web\x_component_cms_ColumnManagerV2\$Main\default\icon\icon_insert_click.png" afterPath="D:\x\x_desktop_web\x_component_cms_ColumnManagerV2\$Main\default\icon\icon_insert_click.png" />
+      <change type="MODIFICATION" beforePath="D:\x\x_desktop_web\x_component_cms_ColumnManagerV2\$Main\default\icon\icon_jiao_ben.png" afterPath="D:\x\x_desktop_web\x_component_cms_ColumnManagerV2\$Main\default\icon\icon_jiao_ben.png" />
+      <change type="MODIFICATION" beforePath="D:\x\x_desktop_web\x_component_cms_ColumnManagerV2\$Main\default\icon\icon_jiao_ben_click.png" afterPath="D:\x\x_desktop_web\x_component_cms_ColumnManagerV2\$Main\default\icon\icon_jiao_ben_click.png" />
+      <change type="MODIFICATION" beforePath="D:\x\x_desktop_web\x_component_cms_ColumnManagerV2\$Main\default\icon\icon_lan_mu.png" afterPath="D:\x\x_desktop_web\x_component_cms_ColumnManagerV2\$Main\default\icon\icon_lan_mu.png" />
+      <change type="MODIFICATION" beforePath="D:\x\x_desktop_web\x_component_cms_ColumnManagerV2\$Main\default\icon\icon_lan_mu_click.png" afterPath="D:\x\x_desktop_web\x_component_cms_ColumnManagerV2\$Main\default\icon\icon_lan_mu_click.png" />
+      <change type="MODIFICATION" beforePath="D:\x\x_desktop_web\x_component_cms_ColumnManagerV2\$Main\default\icon\icon_lie_biao.png" afterPath="D:\x\x_desktop_web\x_component_cms_ColumnManagerV2\$Main\default\icon\icon_lie_biao.png" />
+      <change type="MODIFICATION" beforePath="D:\x\x_desktop_web\x_component_cms_ColumnManagerV2\$Main\default\icon\icon_lie_biao_click.png" afterPath="D:\x\x_desktop_web\x_component_cms_ColumnManagerV2\$Main\default\icon\icon_lie_biao_click.png" />
+      <change type="MODIFICATION" beforePath="D:\x\x_desktop_web\x_component_cms_ColumnManagerV2\$Main\default\icon\icon_mo_ren_lie_biao.png" afterPath="D:\x\x_desktop_web\x_component_cms_ColumnManagerV2\$Main\default\icon\icon_mo_ren_lie_biao.png" />
+      <change type="MODIFICATION" beforePath="D:\x\x_desktop_web\x_component_cms_ColumnManagerV2\$Main\default\icon\icon_mo_ren_lie_biao_click.png" afterPath="D:\x\x_desktop_web\x_component_cms_ColumnManagerV2\$Main\default\icon\icon_mo_ren_lie_biao_click.png" />
+      <change type="MODIFICATION" beforePath="D:\x\x_desktop_web\x_component_cms_ColumnManagerV2\$Main\default\icon\icon_read.png" afterPath="D:\x\x_desktop_web\x_component_cms_ColumnManagerV2\$Main\default\icon\icon_read.png" />
+      <change type="MODIFICATION" beforePath="D:\x\x_desktop_web\x_component_cms_ColumnManagerV2\$Main\default\icon\icon_read_click.png" afterPath="D:\x\x_desktop_web\x_component_cms_ColumnManagerV2\$Main\default\icon\icon_read_click.png" />
+      <change type="MODIFICATION" beforePath="D:\x\x_desktop_web\x_component_cms_ColumnManagerV2\$Main\default\icon\icon_shu_ju_pei_zhi.png" afterPath="D:\x\x_desktop_web\x_component_cms_ColumnManagerV2\$Main\default\icon\icon_shu_ju_pei_zhi.png" />
+      <change type="MODIFICATION" beforePath="D:\x\x_desktop_web\x_component_cms_ColumnManagerV2\$Main\default\icon\icon_shu_ju_pei_zhi_click.png" afterPath="D:\x\x_desktop_web\x_component_cms_ColumnManagerV2\$Main\default\icon\icon_shu_ju_pei_zhi_click.png" />
+      <change type="MODIFICATION" beforePath="D:\x\x_desktop_web\x_component_cms_ColumnManagerV2\$Main\default\icon\icon_shu_ju_shi_tu.png" afterPath="D:\x\x_desktop_web\x_component_cms_ColumnManagerV2\$Main\default\icon\icon_shu_ju_shi_tu.png" />
+      <change type="MODIFICATION" beforePath="D:\x\x_desktop_web\x_component_cms_ColumnManagerV2\$Main\default\icon\icon_shu_ju_shi_tu_click.png" afterPath="D:\x\x_desktop_web\x_component_cms_ColumnManagerV2\$Main\default\icon\icon_shu_ju_shi_tu_click.png" />
+      <change type="MODIFICATION" beforePath="D:\x\x_desktop_web\x_component_cms_ColumnManagerV2\$Main\default\icon\icon_turn.png" afterPath="D:\x\x_desktop_web\x_component_cms_ColumnManagerV2\$Main\default\icon\icon_turn.png" />
+      <change type="MODIFICATION" beforePath="D:\x\x_desktop_web\x_component_cms_ColumnManagerV2\$Main\default\icon\icon_turn_click.png" afterPath="D:\x\x_desktop_web\x_component_cms_ColumnManagerV2\$Main\default\icon\icon_turn_click.png" />
       <change type="MODIFICATION" beforePath="D:\x\x_desktop_web\x_component_HotPicture\$Setting\default\icon\permission.png" afterPath="D:\x\x_desktop_web\x_component_HotPicture\$Setting\default\icon\permission.png" />
       <change type="MODIFICATION" beforePath="D:\x\x_desktop_web\x_component_HotPicture\$Setting\default\icon\role.png" afterPath="D:\x\x_desktop_web\x_component_HotPicture\$Setting\default\icon\role.png" />
       <change type="MODIFICATION" beforePath="D:\x\x_desktop_web\x_component_HotPicture\$Main\bak\icon\settings.png" afterPath="D:\x\x_desktop_web\x_component_HotPicture\$Main\bak\icon\settings.png" />
       <change type="MODIFICATION" beforePath="D:\x\x_desktop_web\x_component_HotPicture\$Setting\default\icon\settings.png" afterPath="D:\x\x_desktop_web\x_component_HotPicture\$Setting\default\icon\settings.png" />
       <change type="MODIFICATION" beforePath="D:\x\x_desktop_web\x_component_HotPicture\$Setting\default\icon\squared.png" afterPath="D:\x\x_desktop_web\x_component_HotPicture\$Setting\default\icon\squared.png" />
       <change type="MODIFICATION" beforePath="D:\x\x_desktop_web\x_component_HotPicture\$Main\bak\icon\title_background.png" afterPath="D:\x\x_desktop_web\x_component_HotPicture\$Main\bak\icon\title_background.png" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/x_component_Execution/Attachment.js" afterPath="$PROJECT_DIR$/x_component_Execution/Attachment.js" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/x_component_Forum/Attachment.js" afterPath="$PROJECT_DIR$/x_component_Forum/Attachment.js" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/x_component_cms_Document/Attachment.js" afterPath="$PROJECT_DIR$/x_component_cms_Document/Attachment.js" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/x_component_Execution/Attachment.min.js" afterPath="$PROJECT_DIR$/x_component_Execution/Attachment.min.js" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/x_component_Forum/Attachment.min.js" afterPath="$PROJECT_DIR$/x_component_Forum/Attachment.min.js" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/x_component_cms_Document/Attachment.min.js" afterPath="$PROJECT_DIR$/x_component_cms_Document/Attachment.min.js" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/x_component_Execution/Chat.js" afterPath="$PROJECT_DIR$/x_component_Execution/Chat.js" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/x_component_Execution/Chat.min.js" afterPath="$PROJECT_DIR$/x_component_Execution/Chat.min.js" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/x_component_Execution/CoreWork.min.js" afterPath="$PROJECT_DIR$/x_component_Execution/CoreWork.min.js" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/x_component_Execution/CreateMainTask.min.js" afterPath="$PROJECT_DIR$/x_component_Execution/CreateMainTask.min.js" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/x_component_Attendance/Main.js" afterPath="$PROJECT_DIR$/x_component_Attendance/Main.js" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/x_component_Execution/ReportAttachment.js" afterPath="$PROJECT_DIR$/x_component_Execution/ReportAttachment.js" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/x_component_Execution/ReportAttachment.min.js" afterPath="$PROJECT_DIR$/x_component_Execution/ReportAttachment.min.js" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/x_component_Execution/StatForm.js" afterPath="$PROJECT_DIR$/x_component_Execution/StatForm.js" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/x_component_Execution/StatForm.min.js" afterPath="$PROJECT_DIR$/x_component_Execution/StatForm.min.js" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/x_component_Execution/WorkDeploy.js" afterPath="$PROJECT_DIR$/x_component_Execution/WorkDeploy.js" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/x_component_Execution/WorkDeploy.min.js" afterPath="$PROJECT_DIR$/x_component_Execution/WorkDeploy.min.js" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/x_component_Execution/WorkDetail.js" afterPath="$PROJECT_DIR$/x_component_Execution/WorkDetail.js" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/x_component_Execution/WorkDetail.min.js" afterPath="$PROJECT_DIR$/x_component_Execution/WorkDetail.min.js" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/x_component_Execution/WorkForm.js" afterPath="$PROJECT_DIR$/x_component_Execution/WorkForm.js" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/x_component_Execution/WorkForm.min.js" afterPath="$PROJECT_DIR$/x_component_Execution/WorkForm.min.js" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/x_component_Execution/WorkGather.js" afterPath="$PROJECT_DIR$/x_component_Execution/WorkGather.js" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/x_component_Execution/WorkGather.min.js" afterPath="$PROJECT_DIR$/x_component_Execution/WorkGather.min.js" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/x_component_Execution/WorkGatherNew.min.js" afterPath="$PROJECT_DIR$/x_component_Execution/WorkGatherNew.min.js" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/x_desktop/res/mwf4/package/widget/$ScriptHelp/cms/code.json" afterPath="$PROJECT_DIR$/x_desktop/res/mwf4/package/widget/$ScriptHelp/cms/code.json" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/x_component_Execution/WorkList.js" afterPath="$PROJECT_DIR$/x_component_Execution/WorkList.js" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/x_component_Execution/WorkList.min.js" afterPath="$PROJECT_DIR$/x_component_Execution/WorkList.min.js" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/x_component_Execution/WorkReport.js" afterPath="$PROJECT_DIR$/x_component_Execution/WorkReport.js" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/x_component_Execution/WorkReport.min.js" afterPath="$PROJECT_DIR$/x_component_Execution/WorkReport.min.js" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/x_component_Execution/WorkReportList.js" afterPath="$PROJECT_DIR$/x_component_Execution/WorkReportList.js" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/x_component_Execution/WorkReportList.min.js" afterPath="$PROJECT_DIR$/x_component_Execution/WorkReportList.min.js" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/x_component_Execution/WorkStat.js" afterPath="$PROJECT_DIR$/x_component_Execution/WorkStat.js" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/x_component_Execution/WorkStat.min.js" afterPath="$PROJECT_DIR$/x_component_Execution/WorkStat.min.js" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/x_component_Execution/WorkTask.js" afterPath="$PROJECT_DIR$/x_component_Execution/WorkTask.js" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/x_component_Execution/WorkTask.min.js" afterPath="$PROJECT_DIR$/x_component_Execution/WorkTask.min.js" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/x_component_Execution/$WorkDetail/default/css.wcss" afterPath="$PROJECT_DIR$/x_component_Execution/$WorkDetail/default/css.wcss" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/x_component_Execution/$WorkStat/default/css.wcss" afterPath="$PROJECT_DIR$/x_component_Execution/$WorkStat/default/css.wcss" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/x_desktop/res/framework/d3/d3.min.js" afterPath="$PROJECT_DIR$/x_desktop/res/framework/d3/d3.min.js" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/x_desktop/res/framework/kityminder/kity/kity.min.js" afterPath="$PROJECT_DIR$/x_desktop/res/framework/kityminder/kity/kity.min.js" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/x_desktop/res/framework/kityminder/editor/dist/kityminder.editor.min.js" afterPath="$PROJECT_DIR$/x_desktop/res/framework/kityminder/editor/dist/kityminder.editor.min.js" />
@@ -92,6 +540,8 @@
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/x_desktop/res/framework/htmleditor/tinymce/themes/modern/theme.min.js" afterPath="$PROJECT_DIR$/x_desktop/res/framework/htmleditor/tinymce/themes/modern/theme.min.js" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/x_desktop/res/framework/htmleditor/tinymce/tinymce.jquery.min.js" afterPath="$PROJECT_DIR$/x_desktop/res/framework/htmleditor/tinymce/tinymce.jquery.min.js" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/x_desktop/res/framework/htmleditor/tinymce/tinymce.min.js" afterPath="$PROJECT_DIR$/x_desktop/res/framework/htmleditor/tinymce/tinymce.min.js" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/x_component_Execution/lp/zh-cn.js" afterPath="$PROJECT_DIR$/x_component_Execution/lp/zh-cn.js" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/x_component_Execution/lp/zh-cn.min.js" afterPath="$PROJECT_DIR$/x_component_Execution/lp/zh-cn.min.js" />
     </list>
     <ignored path="x_desktop_web.iws" />
     <ignored path=".idea/workspace.xml" />
@@ -112,41 +562,31 @@
   </component>
   <component name="FileEditorManager">
     <leaf>
-      <file leaf-file-name="Main.js" pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/x_component_ForumPerson/Main.js">
-          <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="-0.12013348">
-              <caret line="149" column="14" selection-start-line="149" selection-start-column="14" selection-end-line="149" selection-end-column="14" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
       <file leaf-file-name="Main.js" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/x_component_ForumSearch/Main.js">
+        <entry file="file://$PROJECT_DIR$/x_component_cms_FormDesigner/Main.js">
           <provider selected="true" editor-type-id="text-editor">
             <state vertical-scroll-proportion="0.0">
-              <caret line="406" column="34" selection-start-line="406" selection-start-column="29" selection-end-line="406" selection-end-column="34" />
+              <caret line="25" column="25" selection-start-line="25" selection-start-column="25" selection-end-line="25" selection-end-column="25" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="Main.js" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/x_component_ForumSection/Main.js">
+      <file leaf-file-name="Label.js" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/x_component_cms_FormDesigner/Module/Label.js">
           <provider selected="true" editor-type-id="text-editor">
             <state vertical-scroll-proportion="0.0">
-              <caret line="704" column="53" selection-start-line="704" selection-start-column="53" selection-end-line="704" selection-end-column="53" />
+              <caret line="2" column="56" selection-start-line="2" selection-start-column="53" selection-end-line="2" selection-end-column="56" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="Main.js" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/x_component_ForumCategory/Main.js">
+      <file leaf-file-name="Monitor.js" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/x_component_cms_FormDesigner/Module/Monitor.js">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.0">
-              <caret line="226" column="58" selection-start-line="226" selection-start-column="58" selection-end-line="226" selection-end-column="58" />
+            <state vertical-scroll-proportion="0.09399478">
+              <caret line="3" column="17" selection-start-line="3" selection-start-column="17" selection-end-line="3" selection-end-column="22" />
               <folding />
             </state>
           </provider>
@@ -163,60 +603,63 @@
       </list>
     </option>
   </component>
+  <component name="Git.Settings">
+    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$/.." />
+  </component>
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/x_component_cms_Xform/widget/$QueryView/select/css.wcss" />
-        <option value="$PROJECT_DIR$/x_component_cms_QueryViewDesigner/$Main/default/toolbars.html" />
-        <option value="$PROJECT_DIR$/x_component_cms_Xform/widget/$QueryView/default/css.wcss" />
-        <option value="$PROJECT_DIR$/x_desktop/res/mwf4/package/xDesktop/Actions/action.json" />
-        <option value="$PROJECT_DIR$/x_component_cms_Index/Main.js" />
-        <option value="$PROJECT_DIR$/x_component_cms_QueryViewDesigner/$View/view.html" />
-        <option value="$PROJECT_DIR$/x_component_cms_QueryViewDesigner/Property.js" />
-        <option value="$PROJECT_DIR$/x_component_cms_QueryViewDesigner/$View/column.html" />
-        <option value="$PROJECT_DIR$/x_desktop/index.html" />
-        <option value="$PROJECT_DIR$/x_component_cms_Xform/widget/QueryView.js" />
-        <option value="$PROJECT_DIR$/x_component_cms_QueryViewDesigner/$View/view.json" />
-        <option value="$PROJECT_DIR$/x_desktop/res/mwf4/package/widget/$ScriptHelp/cms/code.json" />
-        <option value="$PROJECT_DIR$/x_desktop/res/mwf4/package/xScript/CMSEnvironment.js" />
-        <option value="$PROJECT_DIR$/x_component_cms_Xform/QueryView.js" />
-        <option value="$PROJECT_DIR$/x_component_cms_Module/Main.js" />
-        <option value="$PROJECT_DIR$/x_component_cms_QueryViewDesigner/Main.js" />
-        <option value="$PROJECT_DIR$/x_component_cms_ColumnManager/FormExplorer.js" />
-        <option value="$PROJECT_DIR$/x_component_cms_ColumnManager/CategoryExplorer.min.js" />
-        <option value="$PROJECT_DIR$/x_component_cms_ColumnManager/DictionaryExplorer.js" />
-        <option value="$PROJECT_DIR$/x_component_cms_ColumnManager/DictionaryExplorer.min.js" />
         <option value="$PROJECT_DIR$/x_component_cms_ColumnManager/Explorer.js" />
-        <option value="$PROJECT_DIR$/x_component_cms_ColumnManager/Explorer.min.js" />
-        <option value="$PROJECT_DIR$/x_component_cms_ColumnManager/ViewExplorer.min.js" />
+        <option value="$PROJECT_DIR$/x_component_cms_ColumnManager/$Explorer/full/css.wcss" />
+        <option value="$PROJECT_DIR$/x_component_cms_ColumnManager/DictionaryExplorer.js" />
+        <option value="$PROJECT_DIR$/x_component_cms_DictionaryDesigner/Main.js" />
+        <option value="$PROJECT_DIR$/x_component_cms_QueryViewDesigner/View.js" />
         <option value="$PROJECT_DIR$/x_component_cms_ColumnManager/QueryViewExplorer.js" />
         <option value="$PROJECT_DIR$/x_component_cms_ColumnManager/ScriptExplorer.js" />
         <option value="$PROJECT_DIR$/x_component_cms_ColumnManager/ViewExplorer.js" />
-        <option value="$PROJECT_DIR$/x_component_cms_ColumnManager/CategoryExplorer_bak.js" />
-        <option value="$PROJECT_DIR$/x_component_cms_ColumnManager/$Main/startMenu.json" />
-        <option value="$PROJECT_DIR$/x_component_cms_ColumnManager/CategoryExplorer_bak2.js" />
+        <option value="$PROJECT_DIR$/x_desktop/res/mwf4/package/xDesktop/$Authentication/default/css.wcss" />
+        <option value="$PROJECT_DIR$/x_desktop/res/mwf4/package/xDesktop/Authentication.js" />
+        <option value="$PROJECT_DIR$/x_desktop/res/mwf4/package/xDesktop/$Authentication/application/css.wcss" />
+        <option value="$PROJECT_DIR$/x_component_Forum/$Setting/listItemSection.json" />
+        <option value="$PROJECT_DIR$/x_component_Forum/$Setting/listItemCategory.json" />
+        <option value="$PROJECT_DIR$/x_component_Forum/Setting.js" />
+        <option value="$PROJECT_DIR$/x_component_Forum/Main.js" />
+        <option value="$PROJECT_DIR$/x_component_ForumCategory/Main.js" />
+        <option value="$PROJECT_DIR$/x_component_cms_ColumnManager/lp/zh-cn.js" />
+        <option value="$PROJECT_DIR$/x_component_cms_ColumnManager/FormExplorer.js" />
+        <option value="$PROJECT_DIR$/x_component_cms_Column/Main.js" />
         <option value="$PROJECT_DIR$/x_component_cms_ColumnManager/CategoryExplorer.js" />
         <option value="$PROJECT_DIR$/x_component_cms_ColumnManager/Main.js" />
-        <option value="$PROJECT_DIR$/x_component_cms_ColumnManager/lp/zh-cn.js" />
-        <option value="$PROJECT_DIR$/x_component_cms_ColumnManager/$CategoryExplorer/default/css.wcss" />
-        <option value="$PROJECT_DIR$/x_component_cms_ViewDesigner/lp/zh-cn.js" />
-        <option value="$PROJECT_DIR$/x_component_cms_ColumnManager/$Explorer/full/css.wcss" />
-        <option value="$PROJECT_DIR$/x_component_cms_ColumnManager/$ViewExplorer/default/css.wcss" />
-        <option value="$PROJECT_DIR$/x_component_cms_ColumnManager/CategoryExplorerV2.js" />
         <option value="$PROJECT_DIR$/x_component_Forum/Actions/action.json" />
-        <option value="$PROJECT_DIR$/x_component_Template/MDomItem.js" />
-        <option value="$PROJECT_DIR$/x_component_Template/MForm.js" />
-        <option value="$PROJECT_DIR$/x_component_Template/Explorer.js" />
-        <option value="$PROJECT_DIR$/x_component_ForumDocument/$Main/default/css.wcss" />
-        <option value="$PROJECT_DIR$/x_component_ForumDocument/$Main/default/listItemReply.json" />
-        <option value="$PROJECT_DIR$/x_component_ForumDocument/$Main/default/listItemSubject.json" />
-        <option value="$PROJECT_DIR$/x_component_Forum/Main.js" />
-        <option value="$PROJECT_DIR$/x_component_ForumCategory/Main.js" />
-        <option value="$PROJECT_DIR$/x_component_ForumDocument/Main.js" />
-        <option value="$PROJECT_DIR$/x_component_ForumPerson/Main.js" />
-        <option value="$PROJECT_DIR$/x_component_ForumSearch/Main.js" />
+        <option value="$PROJECT_DIR$/x_component_Forum/Actions/RestActions.js" />
         <option value="$PROJECT_DIR$/x_component_ForumSection/Main.js" />
-        <option value="$PROJECT_DIR$/x_desktop/res/js/forum.js" />
+        <option value="$PROJECT_DIR$/x_component_Forum/Access.js" />
+        <option value="$PROJECT_DIR$/x_component_ForumDocument/Main.js" />
+        <option value="$PROJECT_DIR$/x_component_Attendance/Common.js" />
+        <option value="$PROJECT_DIR$/x_component_Attendance/$Main/default/css.wcss" />
+        <option value="$PROJECT_DIR$/x_component_Attendance/Main.js" />
+        <option value="$PROJECT_DIR$/x_component_cms_ApplicationManager/$CategoryExplorer/default/css.wcss" />
+        <option value="$PROJECT_DIR$/x_component_cms_ApplicationManager/$CategoryExplorer/default/css_bak.wcss" />
+        <option value="$PROJECT_DIR$/x_component_cms_ApplicationManager/$Explorer/default/css.wcss" />
+        <option value="$PROJECT_DIR$/x_component_cms_ApplicationManager/$Explorer/full/css.wcss" />
+        <option value="$PROJECT_DIR$/x_component_cms_ApplicationManager/$Main/default/css.wcss" />
+        <option value="$PROJECT_DIR$/x_component_cms_ApplicationManager/Actions/RestActions.js" />
+        <option value="$PROJECT_DIR$/x_component_cms_ApplicationManager/Actions/RestActions.min.js" />
+        <option value="$PROJECT_DIR$/x_component_cms_ApplicationManager/CategoryExplorer.js" />
+        <option value="$PROJECT_DIR$/x_component_cms_ApplicationManager/CategoryExplorer.min.js" />
+        <option value="$PROJECT_DIR$/x_component_cms_ApplicationManager/DictionaryExplorer.js" />
+        <option value="$PROJECT_DIR$/x_component_cms_ApplicationManager/DictionaryExplorer.min.js" />
+        <option value="$PROJECT_DIR$/x_component_cms_ApplicationManager/Explorer.js" />
+        <option value="$PROJECT_DIR$/x_component_cms_ApplicationManager/Explorer.min.js" />
+        <option value="$PROJECT_DIR$/x_component_cms_ApplicationManager/FormExplorer.js" />
+        <option value="$PROJECT_DIR$/x_component_cms_ApplicationManager/FormExplorer.min.js" />
+        <option value="$PROJECT_DIR$/x_component_cms_ApplicationManager/Main.js" />
+        <option value="$PROJECT_DIR$/x_component_cms_ApplicationManager/Main.min.js" />
+        <option value="$PROJECT_DIR$/x_component_cms_ApplicationManager/QueryViewExplorer.js" />
+        <option value="$PROJECT_DIR$/x_component_cms_ApplicationManager/QueryViewExplorer.min.js" />
+        <option value="$PROJECT_DIR$/x_component_cms_ApplicationManager/RestActions.js" />
+        <option value="$PROJECT_DIR$/x_component_Forum/Attachment.js" />
+        <option value="$PROJECT_DIR$/x_component_cms_Document/Attachment.js" />
       </list>
     </option>
   </component>
@@ -249,7 +692,7 @@
       </profile-state>
     </entry>
   </component>
-  <component name="ProjectLevelVcsManager" settingsEditedManually="false">
+  <component name="ProjectLevelVcsManager" settingsEditedManually="true">
     <OptionsSetting value="true" id="添加" />
     <OptionsSetting value="true" id="移除" />
     <OptionsSetting value="true" id="签出" />
@@ -272,7 +715,6 @@
       <sortByType />
     </navigator>
     <panes>
-      <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
           <PATH>
@@ -323,86 +765,9 @@
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
           </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="x_desktop_web" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="x_desktop_web" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="x_desktop" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="res" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="mwf4" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="x_desktop_web" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="x_desktop_web" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="x_desktop" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="res" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="mwf4" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="package" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="x_desktop_web" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="x_desktop_web" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="x_desktop" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="res" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="mwf4" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="package" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="xDesktop" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
         </subPane>
       </pane>
+      <pane id="Scope" />
       <pane id="Scratches" />
     </panes>
   </component>
@@ -423,18 +788,18 @@
   </component>
   <component name="RecentsManager">
     <key name="CopyFile.RECENT_KEYS">
-      <recent name="D:\x\x_desktop_web\x_component_cms_ColumnManager\$ViewExplorer\default\icon" />
-      <recent name="D:\x\x_desktop_web\x_component_cms_ColumnManager\$Explorer\default\icon" />
-      <recent name="D:\x\x_desktop_web\x_component_cms_ColumnManager\$CategoryExplorer\default\icon" />
-      <recent name="D:\x\x_desktop_web\x_component_cms_ColumnManager\$ViewExplorer\default\processIcon" />
-      <recent name="D:\x\x_desktop_web\x_component_cms_ColumnManager\$Explorer\full\processIcon" />
+      <recent name="D:\x\x_desktop_web" />
+      <recent name="D:\x\x_desktop_web\x_component_Attendance\$Common\fullcalendar\lib" />
+      <recent name="D:\x\x_desktop_web\x_component_Attendance\$Common\echarts" />
+      <recent name="D:\x\x_desktop_web\x_desktop\res\mwf4\package\xDesktop\$Authentication\default\icon" />
+      <recent name="D:\x\x_desktop_web\x_component_cms_ColumnManager\$Explorer\default" />
     </key>
     <key name="MoveFile.RECENT_KEYS">
+      <recent name="D:\x\x_desktop_web\x_component_cms_ColumnManager\$Explorer\default\icon" />
       <recent name="D:\x\x_desktop_web\x_component_Forum\$Login\lp" />
       <recent name="D:\x\x_desktop_web\x_component_Forum\$Setting" />
       <recent name="D:\x\x_desktop_web\x_component_Forum\$Main\default" />
       <recent name="D:\x\x_desktop_web\x_component_Forum\$SettingExplorer" />
-      <recent name="D:\x\x_desktop_web\x_component_Forum\$Main" />
     </key>
   </component>
   <component name="RunManager">
@@ -557,31 +922,31 @@
   </component>
   <component name="ToolWindowManager">
     <frame x="-11" y="0" width="3854" height="2091" extended-state="0" />
-    <editor active="true" />
+    <editor active="false" />
     <layout>
-      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.17305152" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
+      <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.17173052" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32844734" sideWeight="0.4980185" order="6" side_tool="false" content_ui="tabs" />
-      <window_info id="版本控制" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3274098" sideWeight="0.48645833" order="15" side_tool="false" content_ui="tabs" />
-      <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32256326" sideWeight="0.6375165" order="7" side_tool="true" content_ui="tabs" />
+      <window_info id="版本控制" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3274098" sideWeight="0.48538318" order="15" side_tool="false" content_ui="tabs" />
+      <window_info id="调试" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" />
+      <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.3523344" sideWeight="0.6612946" order="7" side_tool="true" content_ui="tabs" />
       <window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
+      <window_info id="File Transfer" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.11129207" sideWeight="0.35984147" order="9" side_tool="false" content_ui="tabs" />
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.24986945" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3274098" sideWeight="0.4266843" order="11" side_tool="false" content_ui="tabs" />
+      <window_info id="运行" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3284868" sideWeight="0.4990782" order="13" side_tool="false" content_ui="tabs" />
       <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
+      <window_info id="找到" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.3523344" sideWeight="0.33870542" order="14" side_tool="false" content_ui="tabs" />
       <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
-      <window_info id="调试" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" />
       <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
-      <window_info id="File Transfer" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.111834966" sideWeight="0.3680317" order="9" side_tool="false" content_ui="tabs" />
       <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
-      <window_info id="消息" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.045556385" sideWeight="0.448512" order="12" side_tool="false" content_ui="tabs" />
-      <window_info id="运行" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32899022" sideWeight="0.5" order="13" side_tool="false" content_ui="tabs" />
+      <window_info id="消息" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.044695746" sideWeight="0.448512" order="12" side_tool="false" content_ui="tabs" />
       <window_info id="Remote Host" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32995737" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
       <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
-      <window_info id="找到" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.34961998" sideWeight="0.3624835" order="14" side_tool="false" content_ui="tabs" />
     </layout>
   </component>
   <component name="Vcs.Log.UiProperties">
@@ -604,7 +969,7 @@
       <breakpoints>
         <line-breakpoint enabled="true" type="javascript">
           <url>file://$PROJECT_DIR$/x_component_cms_ColumnManager/Main.js</url>
-          <line>348</line>
+          <line>421</line>
         </line-breakpoint>
         <line-breakpoint enabled="true" type="javascript">
           <url>file://$PROJECT_DIR$/x_desktop/res/mwf4/package/widget/SimpleEditor.js</url>
@@ -633,7 +998,7 @@
         </line-breakpoint>
         <line-breakpoint enabled="true" type="javascript">
           <url>file://$PROJECT_DIR$/x_component_Forum/Setting.js</url>
-          <line>1452</line>
+          <line>1458</line>
           <option name="timeStamp" value="13" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="javascript">
@@ -643,7 +1008,7 @@
         </line-breakpoint>
         <line-breakpoint enabled="true" type="javascript">
           <url>file://$PROJECT_DIR$/x_component_Forum/Setting.js</url>
-          <line>290</line>
+          <line>291</line>
           <option name="timeStamp" value="15" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="javascript">
@@ -651,396 +1016,438 @@
           <line>1611</line>
           <option name="timeStamp" value="16" />
         </line-breakpoint>
+        <line-breakpoint enabled="true" type="javascript">
+          <url>file://$PROJECT_DIR$/x_component_cms_ColumnManager/CategoryExplorer.js</url>
+          <line>1026</line>
+          <option name="timeStamp" value="17" />
+        </line-breakpoint>
       </breakpoints>
-      <option name="time" value="17" />
+      <option name="time" value="18" />
     </breakpoint-manager>
     <watches-manager />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/x_component_cms_QueryViewDesigner/$Main/default/css.wcss">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-15.377778">
-          <caret line="144" column="30" selection-start-line="144" selection-start-column="5" selection-end-line="144" selection-end-column="30" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/x_desktop/res/framework/mootools/mootools-1.6.0.js">
+    <entry file="file://$PROJECT_DIR$/x_desktop/res/mwf4/package/xDesktop/Authentication.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="2.0288944">
-          <caret line="990" column="4" selection-start-line="990" selection-start-column="4" selection-end-line="990" selection-end-column="4" />
+        <state vertical-scroll-proportion="0.0">
+          <caret line="21" column="4" selection-start-line="21" selection-start-column="4" selection-end-line="21" selection-end-column="4" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/x_component_cms_QueryViewDesigner/Main.js">
+    <entry file="file://$PROJECT_DIR$/x_component_Forum/Access.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="1.0565177">
-          <caret line="63" column="46" selection-start-line="63" selection-start-column="34" selection-end-line="63" selection-end-column="46" />
+        <state vertical-scroll-proportion="0.0">
+          <caret line="59" column="22" selection-start-line="59" selection-start-column="4" selection-end-line="59" selection-end-column="22" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/x_component_cms_ColumnManager/CategoryExplorerV2.min.js">
+    <entry file="file://$PROJECT_DIR$/x_component_Forum/Actions/RestActions.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-0.0">
-          <caret line="0" column="11514" selection-start-line="0" selection-start-column="11514" selection-end-line="0" selection-end-column="11514" />
+        <state vertical-scroll-proportion="0.82067245">
+          <caret line="372" column="124" selection-start-line="372" selection-start-column="124" selection-end-line="372" selection-end-column="124" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/x_component_cms_ColumnManager/DictionaryExplorer.min.js">
+    <entry file="file://$PROJECT_DIR$/x_component_Attendance/$Common/echarts/echarts.common.js">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0">
-          <caret line="0" column="2488" selection-start-line="0" selection-start-column="2488" selection-end-line="0" selection-end-column="2488" />
+          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/x_component_cms_ColumnManager/Explorer.min.js">
+    <entry file="file://$PROJECT_DIR$/x_component_Attendance/$Common/echarts/echarts.common.min.js">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0">
-          <caret line="0" column="4812" selection-start-line="0" selection-start-column="4812" selection-end-line="0" selection-end-column="4812" />
+          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/x_component_cms_ColumnManager/ViewExplorer.min.js">
+    <entry file="file://$PROJECT_DIR$/x_component_ForumSection/Main.js">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0">
-          <caret line="0" column="4347" selection-start-line="0" selection-start-column="4347" selection-end-line="0" selection-end-column="4347" />
+          <caret line="610" column="62" selection-start-line="610" selection-start-column="62" selection-end-line="610" selection-end-column="62" />
+          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/x_component_cms_ColumnManager/DictionaryExplorer.js">
+    <entry file="file://$PROJECT_DIR$/x_component_ForumDocument/$Main/default/listItemSubject.json">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0">
-          <caret line="103" column="34" selection-start-line="103" selection-start-column="34" selection-end-line="103" selection-end-column="34" />
+        <state vertical-scroll-proportion="0.49263293">
+          <caret line="110" column="28" selection-start-line="110" selection-start-column="28" selection-end-line="110" selection-end-column="28" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/x_component_cms_ColumnManager/QueryViewExplorer.js">
+    <entry file="file://$PROJECT_DIR$/x_component_Forum/Actions/action.json">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0">
-          <caret line="19" column="32" selection-start-line="19" selection-start-column="32" selection-end-line="19" selection-end-column="32" />
+        <state vertical-scroll-proportion="0.07751442">
+          <caret line="136" column="19" selection-start-line="136" selection-start-column="3" selection-end-line="136" selection-end-column="19" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/x_component_cms_ColumnManager/ScriptExplorer.js">
+    <entry file="file://$PROJECT_DIR$/x_component_Attendance/$Common/fullcalendar/lib/jquery-ui.custom.js">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0">
-          <caret line="21" column="38" selection-start-line="21" selection-start-column="38" selection-end-line="21" selection-end-column="38" />
+          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/x_component_cms_ColumnManager/$Main/startMenu.json">
+    <entry file="file://$PROJECT_DIR$/x_component_Attendance/Common.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.7440207">
-          <caret line="60" column="31" selection-start-line="60" selection-start-column="15" selection-end-line="60" selection-end-column="31" />
+        <state vertical-scroll-proportion="0.42611682">
+          <caret line="52" column="93" selection-start-line="52" selection-start-column="93" selection-end-line="52" selection-end-column="93" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/x_component_cms_ViewDesigner/$View/default/operation.json">
+    <entry file="file://$PROJECT_DIR$/x_desktop/res/mwf4/package/xAction/Authentication/RestActions.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-0.25270963">
-          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+        <state vertical-scroll-proportion="0.6185567">
+          <caret line="74" column="17" selection-start-line="74" selection-start-column="17" selection-end-line="74" selection-end-column="17" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/x_component_cms_ViewDesigner/$Main/default/css.wcss">
+    <entry file="file://$PROJECT_DIR$/x_component_Attendance/$Main/default/css.wcss">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.17865565">
-          <caret line="10" column="0" selection-start-line="10" selection-start-column="0" selection-end-line="10" selection-end-column="0" />
+        <state vertical-scroll-proportion="0.0">
+          <caret line="8" column="22" selection-start-line="8" selection-start-column="22" selection-end-line="8" selection-end-column="22" />
+          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/x_component_cms_ViewDesigner/View.js">
+    <entry file="file://$PROJECT_DIR$/x_component_cms_ColumnManager/$Main/default/css.wcss">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0">
-          <caret line="1013" column="42" selection-start-line="1013" selection-start-column="30" selection-end-line="1013" selection-end-column="42" />
+          <caret line="39" column="22" selection-start-line="39" selection-start-column="22" selection-end-line="39" selection-end-column="23" />
+          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/x_component_cms_ViewDesigner/$View/default/css.wcss">
+    <entry file="file://$PROJECT_DIR$/x_component_cms_ColumnManager/Explorer.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-14.4">
-          <caret line="100" column="6" selection-start-line="92" selection-start-column="4" selection-end-line="100" selection-end-column="6" />
+        <state vertical-scroll-proportion="0.0">
+          <caret line="180" column="4" selection-start-line="180" selection-start-column="4" selection-end-line="187" selection-end-column="6" />
+          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/x_component_cms_ColumnManager/Main.js">
+    <entry file="file://$PROJECT_DIR$/x_component_cms_ColumnManager/FormExplorer.js">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0">
-          <caret line="680" column="56" selection-start-line="680" selection-start-column="54" selection-end-line="680" selection-end-column="56" />
+          <caret line="3" column="48" selection-start-line="3" selection-start-column="48" selection-end-line="3" selection-end-column="48" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/x_component_cms_ColumnManager/lp/zh-cn.js">
+    <entry file="file://$PROJECT_DIR$/x_component_cms_ColumnManager/CategoryExplorer.js">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0">
-          <caret line="124" column="42" selection-start-line="124" selection-start-column="42" selection-end-line="124" selection-end-column="42" />
+          <caret line="1065" column="50" selection-start-line="1065" selection-start-column="50" selection-end-line="1065" selection-end-column="50" />
+          <folding>
+            <element signature="e#14746#20258#0" expanded="false" />
+            <element signature="e#20335#39881#0" expanded="false" />
+            <element signature="e#39963#41187#0" expanded="false" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/x_component_cms_ViewDesigner/lp/zh-cn.js">
+    <entry file="file://$PROJECT_DIR$/x_component_cms_ColumnManager/Main.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0">
-          <caret line="51" column="47" selection-start-line="51" selection-start-column="47" selection-end-line="51" selection-end-column="47" />
+        <state vertical-scroll-proportion="0.66101694">
+          <caret line="639" column="5" selection-start-line="639" selection-start-column="5" selection-end-line="643" selection-end-column="5" />
+          <folding>
+            <element signature="e#28366#56704#0" expanded="false" />
+            <element signature="e#56761#57874#0" expanded="false" />
+            <marker date="1487602679826" expanded="true" signature="-1:-1" placeholder="..." />
+            <marker date="1487602679826" expanded="true" signature="-1:-1" placeholder="..." />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/x_component_cms_ColumnManager/FormExplorer.js">
+    <entry file="file://$PROJECT_DIR$/x_component_Attendance/Main.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0">
-          <caret line="3" column="51" selection-start-line="3" selection-start-column="51" selection-end-line="3" selection-end-column="51" />
+        <state vertical-scroll-proportion="0.86440676">
+          <caret line="491" column="5" selection-start-line="491" selection-start-column="5" selection-end-line="491" selection-end-column="5" />
+          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/x_component_cms_ColumnManager/Explorer.js">
+    <entry file="file://$PROJECT_DIR$/x_component_cms_ApplicationManager/$CategoryExplorer/default/css.wcss">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0">
-          <caret line="257" column="4" selection-start-line="257" selection-start-column="4" selection-end-line="264" selection-end-column="6" />
+        <state vertical-scroll-proportion="-8.177778">
+          <caret line="556" column="41" selection-start-line="556" selection-start-column="41" selection-end-line="556" selection-end-column="41" />
+          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/x_component_cms_ColumnManager/$Explorer/default/css.wcss">
+    <entry file="file://$PROJECT_DIR$/x_component_cms_ApplicationManager/$CategoryExplorer/default/css_bak.wcss">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-2.264706">
-          <caret line="8" column="43" selection-start-line="8" selection-start-column="43" selection-end-line="8" selection-end-column="43" />
+        <state vertical-scroll-proportion="-8.177778">
+          <caret line="226" column="47" selection-start-line="226" selection-start-column="47" selection-end-line="226" selection-end-column="47" />
+          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/x_component_cms_ColumnManager/$Explorer/full/css.wcss">
+    <entry file="file://$PROJECT_DIR$/x_component_cms_ApplicationManager/$Explorer/default/css.wcss">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-9.921569">
-          <caret line="335" column="115" selection-start-line="335" selection-start-column="115" selection-end-line="335" selection-end-column="115" />
+        <state vertical-scroll-proportion="-14.933333">
+          <caret line="498" column="41" selection-start-line="498" selection-start-column="41" selection-end-line="498" selection-end-column="41" />
+          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/x_component_cms_ColumnManager/ViewExplorer.js">
+    <entry file="file://$PROJECT_DIR$/x_component_cms_ApplicationManager/$Explorer/full/css.wcss">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.13251534">
-          <caret line="218" column="5" selection-start-line="218" selection-start-column="5" selection-end-line="218" selection-end-column="5" />
+        <state vertical-scroll-proportion="-14.933333">
+          <caret line="536" column="41" selection-start-line="536" selection-start-column="41" selection-end-line="536" selection-end-column="41" />
+          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/x_component_cms_ColumnManager/$CategoryExplorer/default/css.wcss">
+    <entry file="file://$PROJECT_DIR$/x_component_cms_ApplicationManager/$Main/default/css.wcss">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0">
-          <caret line="598" column="2" selection-start-line="598" selection-start-column="2" selection-end-line="606" selection-end-column="3" />
+        <state vertical-scroll-proportion="-8.177778">
+          <caret line="191" column="22" selection-start-line="191" selection-start-column="22" selection-end-line="191" selection-end-column="22" />
+          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/x_component_cms_ColumnManager/$ViewExplorer/default/css.wcss">
+    <entry file="file://$PROJECT_DIR$/x_component_cms_ApplicationManager/Actions/RestActions.js">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0">
-          <caret line="348" column="20" selection-start-line="348" selection-start-column="20" selection-end-line="348" selection-end-column="20" />
+          <caret line="7" column="126" selection-start-line="7" selection-start-column="126" selection-end-line="7" selection-end-column="126" />
+          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/x_component_cms_ColumnManager/CategoryExplorer.js">
+    <entry file="file://$PROJECT_DIR$/x_component_cms_ApplicationManager/Actions/RestActions.min.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0">
-          <caret line="368" column="52" selection-start-line="368" selection-start-column="46" selection-end-line="368" selection-end-column="52" />
+        <state vertical-scroll-proportion="-0.0">
+          <caret line="0" column="563" selection-start-line="0" selection-start-column="563" selection-end-line="0" selection-end-column="563" />
+          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/x_component_cms_ColumnManager/Actions/RestActions.js">
+    <entry file="file://$PROJECT_DIR$/x_component_cms_ApplicationManager/CategoryExplorer.js">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0">
-          <caret line="367" column="11" selection-start-line="367" selection-start-column="4" selection-end-line="367" selection-end-column="11" />
+          <caret line="1585" column="34" selection-start-line="1585" selection-start-column="34" selection-end-line="1585" selection-end-column="34" />
+          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/x_component_cms_ColumnManager/CategoryExplorerV2.js">
+    <entry file="file://$PROJECT_DIR$/x_component_cms_ApplicationManager/CategoryExplorer.min.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0">
-          <caret line="1600" column="65" selection-start-line="1600" selection-start-column="65" selection-end-line="1600" selection-end-column="65" />
+        <state vertical-scroll-proportion="90.92453">
+          <caret line="1" column="2317" selection-start-line="1" selection-start-column="2317" selection-end-line="1" selection-end-column="2317" />
+          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/x_component_Forum/Actions/RestActions.js">
+    <entry file="file://$PROJECT_DIR$/x_component_cms_ApplicationManager/DictionaryExplorer.js">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0">
-          <caret line="361" column="19" selection-start-line="361" selection-start-column="4" selection-end-line="361" selection-end-column="19" />
+          <caret line="79" column="34" selection-start-line="79" selection-start-column="34" selection-end-line="79" selection-end-column="34" />
+          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/x_component_Template/Explorer.js">
+    <entry file="file://$PROJECT_DIR$/x_component_cms_ApplicationManager/RestActions.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="16.570621">
-          <caret line="1447" column="31" selection-start-line="1447" selection-start-column="31" selection-end-line="1447" selection-end-column="31" />
+        <state vertical-scroll-proportion="0.12743251">
+          <caret line="211" column="72" selection-start-line="211" selection-start-column="72" selection-end-line="211" selection-end-column="72" />
+          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/x_component_Template/MForm.js">
+    <entry file="file://$PROJECT_DIR$/x_component_cms_ApplicationManager/QueryViewExplorer.min.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="1.2937853">
-          <caret line="324" column="25" selection-start-line="324" selection-start-column="25" selection-end-line="324" selection-end-column="25" />
+        <state vertical-scroll-proportion="0.0">
+          <caret line="0" column="1428" selection-start-line="0" selection-start-column="1428" selection-end-line="0" selection-end-column="1428" />
+          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/x_component_Template/MDomItem.js">
+    <entry file="file://$PROJECT_DIR$/x_component_cms_ApplicationManager/QueryViewExplorer.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.3898305">
-          <caret line="1248" column="34" selection-start-line="1248" selection-start-column="34" selection-end-line="1248" selection-end-column="34" />
+        <state vertical-scroll-proportion="0.24042687">
+          <caret line="58" column="34" selection-start-line="58" selection-start-column="34" selection-end-line="58" selection-end-column="34" />
+          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/x_component_ForumDocument/$Main/default/css.wcss">
+    <entry file="file://$PROJECT_DIR$/x_component_cms_ApplicationManager/Main.min.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.2850436">
-          <caret line="536" column="26" selection-start-line="536" selection-start-column="26" selection-end-line="536" selection-end-column="26" />
+        <state vertical-scroll-proportion="0.7896104">
+          <caret line="1" column="1339" selection-start-line="1" selection-start-column="1339" selection-end-line="1" selection-end-column="1339" />
+          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/x_desktop/res/mwf4/package/xAction/Authentication/action.json">
+    <entry file="file://$PROJECT_DIR$/x_component_cms_ApplicationManager/Main.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-4.8">
-          <caret line="6" column="78" selection-start-line="6" selection-start-column="78" selection-end-line="6" selection-end-column="78" />
+        <state vertical-scroll-proportion="0.24042687">
+          <caret line="1320" column="21" selection-start-line="1320" selection-start-column="21" selection-end-line="1320" selection-end-column="21" />
+          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/x_component_ForumPerson/lp/zh-cn.js">
+    <entry file="file://$PROJECT_DIR$/x_component_cms_ApplicationManager/FormExplorer.min.js">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0">
-          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <caret line="0" column="3578" selection-start-line="0" selection-start-column="3578" selection-end-line="0" selection-end-column="3578" />
+          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/x_component_Forum/lp/zh-cn.js">
+    <entry file="file://$PROJECT_DIR$/x_component_cms_ApplicationManager/FormExplorer.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-10.140351">
-          <caret line="234" column="16" selection-start-line="234" selection-start-column="5" selection-end-line="234" selection-end-column="16" />
+        <state vertical-scroll-proportion="0.24042687">
+          <caret line="140" column="34" selection-start-line="140" selection-start-column="34" selection-end-line="140" selection-end-column="34" />
+          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/x_component_Common/Main.js">
+    <entry file="file://$PROJECT_DIR$/x_component_cms_ApplicationManager/Explorer.min.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-14.526316">
-          <caret line="56" column="27" selection-start-line="56" selection-start-column="18" selection-end-line="56" selection-end-column="27" />
+        <state vertical-scroll-proportion="0.8181818">
+          <caret line="0" column="8409" selection-start-line="0" selection-start-column="8409" selection-end-line="0" selection-end-column="8409" />
+          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/x_desktop/res/js/forumDocMobile.js">
+    <entry file="file://$PROJECT_DIR$/x_component_cms_ApplicationManager/Explorer.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0">
-          <caret line="175" column="16" selection-start-line="175" selection-start-column="16" selection-end-line="175" selection-end-column="16" />
+        <state vertical-scroll-proportion="0.24042687">
+          <caret line="376" column="88" selection-start-line="376" selection-start-column="88" selection-end-line="376" selection-end-column="88" />
+          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/x_component_Forum/Access.js">
+    <entry file="file://$PROJECT_DIR$/x_component_cms_ApplicationManager/DictionaryExplorer.min.js">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0">
-          <caret line="42" column="9" selection-start-line="42" selection-start-column="4" selection-end-line="42" selection-end-column="9" />
+          <caret line="0" column="2033" selection-start-line="0" selection-start-column="2033" selection-end-line="0" selection-end-column="2033" />
+          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/x_component_Forum/Actions/action.json">
+    <entry file="file://$PROJECT_DIR$/x_component_cms_Document/Attachment.js">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0">
-          <caret line="144" column="68" selection-start-line="144" selection-start-column="68" selection-end-line="144" selection-end-column="68" />
+          <caret line="105" column="36" selection-start-line="105" selection-start-column="36" selection-end-line="105" selection-end-column="36" />
+          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/x_component_ForumDocument/$Main/default/listItemReply.json">
+    <entry file="file://$PROJECT_DIR$/x_component_cms_Column/Main.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0">
-          <caret line="97" column="139" selection-start-line="97" selection-start-column="117" selection-end-line="97" selection-end-column="139" />
+        <state vertical-scroll-proportion="0.33333334">
+          <caret line="699" column="78" selection-start-line="699" selection-start-column="78" selection-end-line="699" selection-end-column="78" />
+          <folding>
+            <marker date="1487601226577" expanded="true" signature="-1:-1" placeholder="..." />
+            <marker date="1487601226577" expanded="true" signature="-1:-1" placeholder="..." />
+            <marker date="1487601226577" expanded="true" signature="-1:-1" placeholder="..." />
+            <marker date="1487601226577" expanded="true" signature="-1:-1" placeholder="..." />
+            <marker date="1487601226577" expanded="true" signature="-1:-1" placeholder="..." />
+            <marker date="1487601226577" expanded="true" signature="-1:-1" placeholder="..." />
+            <marker date="1487601226577" expanded="true" signature="-1:-1" placeholder="..." />
+            <marker date="1487601226577" expanded="true" signature="-1:-1" placeholder="..." />
+            <marker date="1487601226577" expanded="true" signature="-1:-1" placeholder="..." />
+            <marker date="1487601226577" expanded="true" signature="-1:-1" placeholder="..." />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/x_component_ForumSearch/Main.js">
+    <entry file="file://$PROJECT_DIR$/x_component_ForumDocument/Main.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0">
-          <caret line="406" column="34" selection-start-line="406" selection-start-column="29" selection-end-line="406" selection-end-column="34" />
-          <folding />
+        <state vertical-scroll-proportion="0.33333334">
+          <caret line="1912" column="45" selection-start-line="1912" selection-start-column="45" selection-end-line="1912" selection-end-column="45" />
+          <folding>
+            <marker date="1487736421939" expanded="true" signature="-1:-1" placeholder="..." />
+            <marker date="1487736421939" expanded="true" signature="-1:-1" placeholder="..." />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/x_component_ForumSection/Main.js">
+    <entry file="file://$PROJECT_DIR$/x_component_Forum/Attachment.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0">
-          <caret line="704" column="53" selection-start-line="704" selection-start-column="53" selection-end-line="704" selection-end-column="53" />
+        <state vertical-scroll-proportion="0.33333334">
+          <caret line="104" column="36" selection-start-line="104" selection-start-column="36" selection-end-line="104" selection-end-column="36" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/x_component_ForumCategory/Main.js">
+    <entry file="file://$PROJECT_DIR$/x_component_cms_FormDesigner/Module/Attachment/attachment.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0">
-          <caret line="226" column="58" selection-start-line="226" selection-start-column="58" selection-end-line="226" selection-end-column="58" />
-          <folding />
+        <state vertical-scroll-proportion="1.4891304">
+          <caret line="91" column="61" selection-start-line="91" selection-start-column="61" selection-end-line="91" selection-end-column="61" />
+          <folding>
+            <element signature="n#style#0;n#div#0;n#!!top" expanded="false" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/x_desktop/res/mwf4/package/xDesktop/Layout.js">
+    <entry file="file://$PROJECT_DIR$/x_component_cms_FormDesigner/Module/Actionbar/actionbar.html">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0">
-          <caret line="676" column="26" selection-start-line="676" selection-start-column="26" selection-end-line="676" selection-end-column="26" />
+          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding>
+            <element signature="n#style#0;n#div#0;n#!!top" expanded="false" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/x_component_cms_FormDesigner/Module/Html.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="-2.6971278">
+          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/x_desktop/res/mwf4/package/xDesktop/Authentication.js">
+    <entry file="file://$PROJECT_DIR$/x_component_cms_FormDesigner/Module/Form.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.66518354">
-          <caret line="1375" column="89" selection-start-line="1375" selection-start-column="89" selection-end-line="1375" selection-end-column="89" />
-          <folding>
-            <marker date="1483411126172" expanded="true" signature="-1:-1" placeholder="..." />
-            <marker date="1483411126172" expanded="true" signature="-1:-1" placeholder="..." />
-            <marker date="1483411126172" expanded="true" signature="-1:-1" placeholder="..." />
-            <marker date="1483411126172" expanded="true" signature="-1:-1" placeholder="..." />
-            <marker date="1483411126172" expanded="true" signature="-1:-1" placeholder="..." />
-            <marker date="1483411126172" expanded="true" signature="-1:-1" placeholder="..." />
-            <marker date="1483411126172" expanded="true" signature="-1:-1" placeholder="..." />
-            <marker date="1483411126172" expanded="true" signature="-1:-1" placeholder="..." />
-            <marker date="1483411126172" expanded="true" signature="-1:-1" placeholder="..." />
-            <marker date="1483411126172" expanded="true" signature="-1:-1" placeholder="..." />
-            <marker date="1483411126172" expanded="true" signature="-1:-1" placeholder="..." />
-            <marker date="1483411126172" expanded="true" signature="-1:-1" placeholder="..." />
-            <marker date="1483411126172" expanded="true" signature="-1:-1" placeholder="..." />
-            <marker date="1483411126172" expanded="true" signature="-1:-1" placeholder="..." />
-            <marker date="1483411126172" expanded="true" signature="-1:-1" placeholder="..." />
-            <marker date="1483411126172" expanded="true" signature="-1:-1" placeholder="..." />
-          </folding>
+        <state vertical-scroll-proportion="5.7023497">
+          <caret line="182" column="59" selection-start-line="182" selection-start-column="59" selection-end-line="182" selection-end-column="59" />
+          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/x_desktop/res/js/forum.js">
+    <entry file="file://$PROJECT_DIR$/x_component_cms_FormDesigner/Module/Office.js">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0">
-          <caret line="156" column="50" selection-start-line="156" selection-start-column="50" selection-end-line="156" selection-end-column="50" />
+          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/x_component_ForumDocument/$Main/default/listItemSubject.json">
+    <entry file="file://$PROJECT_DIR$/x_component_cms_DictionaryDesigner/Dictionary.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.6098117">
-          <caret line="113" column="144" selection-start-line="113" selection-start-column="144" selection-end-line="113" selection-end-column="144" />
+        <state vertical-scroll-proportion="0.0">
+          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/x_component_ForumDocument/Main.js">
+    <entry file="file://$PROJECT_DIR$/x_component_cms_FormDesigner/Main.js">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0">
-          <caret line="1037" column="33" selection-start-line="1037" selection-start-column="33" selection-end-line="1037" selection-end-column="33" />
-          <folding>
-            <marker date="1486713763332" expanded="true" signature="-1:-1" placeholder="..." />
-            <marker date="1486713763332" expanded="true" signature="-1:-1" placeholder="..." />
-          </folding>
+          <caret line="25" column="25" selection-start-line="25" selection-start-column="25" selection-end-line="25" selection-end-column="25" />
+          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/x_component_Forum/Main.js">
+    <entry file="file://$PROJECT_DIR$/x_component_cms_FormDesigner/Module/Label.js">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0">
-          <caret line="249" column="9" selection-start-line="249" selection-start-column="9" selection-end-line="249" selection-end-column="9" />
+          <caret line="2" column="56" selection-start-line="2" selection-start-column="53" selection-end-line="2" selection-end-column="56" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/x_component_ForumPerson/Main.js">
+    <entry file="file://$PROJECT_DIR$/x_component_cms_FormDesigner/Module/Monitor.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-0.12013348">
-          <caret line="149" column="14" selection-start-line="149" selection-start-column="14" selection-end-line="149" selection-end-column="14" />
+        <state vertical-scroll-proportion="0.09399478">
+          <caret line="3" column="17" selection-start-line="3" selection-start-column="17" selection-end-line="3" selection-end-column="22" />
           <folding />
         </state>
       </provider>

x_desktop_web/x_component_Attendance/$Main/default/css.wcss

@@ -6,16 +6,20 @@
     "background-color" : "#fff", //"#fcfcfc",
     "opacity": 1
   },
+  "naviScrollNode" : {
+    "overflow": "hidden"
+  },
+  "naviAreaNode" : {
+  },
   "naviNode": {
     "padding-top" : "10px",
-    "width": "192px",
+    "width": "202px",
     "height": "100%",
     "overflow": "hidden",
     //    "border": "0px",
     //    "border-radius": "0px",
     "float": "left",
     "position": "static",
-    "overflow": "hidden",
     //"margin-right" : "-7px",
     //"background-color" : "#fcfcfc",
     "background-color" : "#365775" //"#476783"

x_desktop_web/x_component_Attendance/AppSetting.js

@@ -256,7 +256,7 @@ MWF.xApplication.Attendance.AppSetting = new Class({
         arr.each( function( d ){
             this.app.restActions.saveSetting( d, function(json){
                 if( json.type == "ERROR" ){
-                    this.app.notice( json.userMessage  , "error");
+                    this.app.notice( json.message  , "error");
                     flag = false;
                 }
             }.bind(this), null, false);

x_desktop_web/x_component_Attendance/AppealExplorer.js

@@ -338,7 +338,7 @@ MWF.xApplication.Attendance.AppealExplorer.Document = new Class({
     process: function( data ){
         this.app.restActions.processAppeal( this.data.id, data, function(json){
             if( json.type == "ERROR" ){
-                this.app.notice( json.userMessage  , "error");
+                this.app.notice( json.message  , "error");
             }else{
                 if( !this.explorer.batchAppeals ){
                     if(this.explorer.view)this.explorer.view.reload();
@@ -615,7 +615,7 @@ MWF.xApplication.Attendance.AppealExplorer.Appeal = new Class({
     process: function( data ){
         this.app.restActions.processAppeal( this.data.id, data, function(json){
             if( json.type == "ERROR" ){
-                this.app.notice( json.userMessage , "error");
+                this.app.notice( json.message , "error");
             }else{
                 this.createMarkNode.destroy();
                 this.createAreaNode.destroy();

x_desktop_web/x_component_Attendance/Common.js

@@ -47,8 +47,8 @@ MWF.xApplication.Attendance.Calendar = new Class({
     },
     loadResource: function ( callback ) {
         var baseUrls = [
-            "/x_component_Attendance/$Common/fullcalendar/lib/moment.min.js",
-            "/x_component_Attendance/$Common/fullcalendar/lib/jquery.min.js"
+            "/x_component_Attendance/$Common/fullcalendar/lib/moment.js",
+            "/x_component_Attendance/$Common/fullcalendar/lib/jquery.js"
         ];
         var fullcalendarUrl = "/x_component_Attendance/$Common/fullcalendar/fullcalendar.js";
         var langUrl =  "/x_component_Attendance/$Common/fullcalendar/lang/zh-cn.js";
@@ -123,7 +123,7 @@ MWF.xApplication.Attendance.Echarts = new Class({
     },
     loadResource: function ( callback ) {
         var baseUrls = [
-            "/x_component_Attendance/$Common/echarts/echarts.common.min.js"
+            "/x_component_Attendance/$Common/echarts/echarts.common.js"
         ];
         var themeUrl = "/x_component_Attendance/$Common/echarts/theme/shine.js";
         COMMON.AjaxModule.load(baseUrls, function(){

x_desktop_web/x_component_Attendance/Explorer.js

@@ -792,7 +792,7 @@ MWF.xApplication.Attendance.Explorer.PopupForm = new Class({
         if( data ){
             this._ok( data, function( json ){
                 if( json.type == "ERROR" ){
-                    this.app.notice( json.userMessage  , "error");
+                    this.app.notice( json.message  , "error");
                 }else{
                     this.formMarkNode.destroy();
                     this.formAreaNode.destroy();

x_desktop_web/x_component_Attendance/HolidayExplorer.js

@@ -371,7 +371,7 @@ MWF.xApplication.Attendance.HolidayExplorer.Holiday = new Class({
                         "configDate": date,
                         "configType": "Holiday"
                     }, function(json){
-                        if( json.type == "ERROR" ){error=json.userMessage}
+                        if( json.type == "ERROR" ){error=json.message}
                     }.bind(this),
                         function(json){
                         flag = false;
@@ -386,7 +386,7 @@ MWF.xApplication.Attendance.HolidayExplorer.Holiday = new Class({
                             "configDate": this.dateFormat( new Date(date),"yyyy-MM-dd"),
                             "configType": "Workday"
                         }, function(json){
-                            if( json.type == "ERROR" ){error=json.userMessage}
+                            if( json.type == "ERROR" ){error=json.message}
                         },function(json){
                             flag = false;
                         }.bind(this),false);

x_desktop_web/x_component_Attendance/ImportExplorer.js

@@ -383,7 +383,7 @@ MWF.xApplication.Attendance.ImportExplorer.Importer = new Class({
     import: function( id ){
         this.actions.importAttachment( id, function(json){
             if( json.type == "ERROR" ){
-                this.app.notice( json.userMessage  , "error");
+                this.app.notice( json.message  , "error");
             }else{
                 this.app.notice("数据导入成功！","success");
 

x_desktop_web/x_component_Attendance/Main.js

@@ -309,6 +309,11 @@ MWF.xApplication.Attendance.Navi = new Class({
 		this.load();
 	},
 	load: function(){
+		this.scrollNode = new Element("div.naviScrollNode", { "styles" : this.css.naviScrollNode }).inject( this.node );
+		this.areaNode = new Element("div.naviAreaNode", { "styles" : this.css.naviAreaNode }).inject( this.scrollNode );
+
+		this.setNodeScroll();
+
 		var naviUrl = this.app.path+"navi.json";
 		MWF.getJSON(naviUrl, function(json){
 			json.each(function(navi){
@@ -321,6 +326,18 @@ MWF.xApplication.Attendance.Navi = new Class({
 				}
 			}.bind(this));
 			if( this.options.id == "" )this.elements[0].click();
+
+			this.setContentSize();
+
+			this.app.addEvent("resize", this.setContentSize.bind(this));
+		}.bind(this));
+	},
+	setNodeScroll: function(){
+		MWF.require("MWF.widget.DragScroll", function(){
+			new MWF.widget.DragScroll(this.scrollNode);
+		}.bind(this));
+		MWF.require("MWF.widget.ScrollBar", function(){
+			new MWF.widget.ScrollBar(this.scrollNode, {"indent": false});
 		}.bind(this));
 	},
 	createNaviNode :function(data){
@@ -332,7 +349,7 @@ MWF.xApplication.Attendance.Navi = new Class({
 				if( !this.app.isDepartmentManager() && !this.app.isAdmin() )flag = false;
 			}
 			if( flag ){
-				new Element("div", { "styles": this.css.viewNaviSepartorNode }).inject(this.node);
+				new Element("div", { "styles": this.css.viewNaviSepartorNode }).inject(this.areaNode);
 			}
 		}else if( data.sub && data.sub.length > 0 ){
 			this.createNaviMenuNode(data);
@@ -359,7 +376,7 @@ MWF.xApplication.Attendance.Navi = new Class({
 			"text": data.title
 		});
 		textNode.inject(menuNode);
-		menuNode.inject(this.node);
+		menuNode.inject(this.areaNode);
 
 		this.menus[data.id] = {};
 		this.menus[data.id].node = menuNode;
@@ -435,7 +452,7 @@ MWF.xApplication.Attendance.Navi = new Class({
 		});
 		textNode.inject(itemNode);
 
-		itemNode.inject(this.node);
+		itemNode.inject(this.areaNode);
 
 		this.elements.push(itemNode);
 		this.items[data.id] = itemNode;
@@ -468,6 +485,10 @@ MWF.xApplication.Attendance.Navi = new Class({
 		if (navi.action && this.app[navi.action]) {
 			this.app[navi.action].call(this.app, navi);
 		}
+	},
+	setContentSize : function(){
+		var size = this.app.content.getSize();
+		this.scrollNode.setStyle("height", size.y - 5 );
 	}
 	//loadCalendar: function () {
 	//	var calendarArea = new Element("div#calendarArea",{

x_desktop_web/x_component_Attendance/MyAppealExplorer.js

@@ -523,7 +523,7 @@ MWF.xApplication.Attendance.MyAppealExplorer.Appeal = new Class({
     process: function( data ){
         this.app.restActions.processAppeal( this.data.id, data, function(json){
             if( json.type == "ERROR" ){
-                this.app.notice( json.userMessage  , "error");
+                this.app.notice( json.message  , "error");
             }else{
                 this.createMarkNode.destroy();
                 this.createAreaNode.destroy();

x_desktop_web/x_component_Attendance/PermissionExplorer.js

@@ -299,7 +299,7 @@ MWF.xApplication.Attendance.PermissionExplorer.Permission = new Class({
         if (data.adminName ){
             this.app.restActions.savePermission(data, function(json){
                 if( json.type == "ERROR" ){
-                    this.app.notice( json.userMessage  , "error");
+                    this.app.notice( json.message  , "error");
                 }else{
                     this.createMarkNode.destroy();
                     this.createAreaNode.destroy();

x_desktop_web/x_component_Attendance/PersonDetail.js

@@ -986,7 +986,7 @@ MWF.xApplication.Attendance.PersonDetail.Appeal = new Class({
             data.processPerson1 = identity;
             this.app.restActions.createAppeal(this.data.id, data, function (json) {
                 if (json.type == "ERROR") {
-                    this.app.notice(json.userMessage, "error");
+                    this.app.notice(json.message, "error");
                 } else {
                     this.createMarkNode.destroy();
                     this.createAreaNode.destroy();
@@ -999,7 +999,7 @@ MWF.xApplication.Attendance.PersonDetail.Appeal = new Class({
                 data.processPerson1 = js.data.name;
                 this.app.restActions.createAppeal(this.data.id, data, function (json) {
                     if (json.type == "ERROR") {
-                        this.app.notice(json.userMessage, "error");
+                        this.app.notice(json.message, "error");
                     } else {
                         this.createMarkNode.destroy();
                         this.createAreaNode.destroy();

x_desktop_web/x_component_Attendance/ScheduleExplorer.js

@@ -345,7 +345,7 @@ MWF.xApplication.Attendance.ScheduleExplorer.Schedule = new Class({
         if (data.onDutyTime && data.offDutyTime && data.lateStartTime ){
             this.app.restActions.saveSchedule(data, function(json){
                 if( json.type == "ERROR" ){
-                    this.app.notice( json.userMessage  , "error");
+                    this.app.notice( json.message  , "error");
                 }else{
                     this.createMarkNode.destroy();
                     this.createAreaNode.destroy();

x_desktop_web/x_component_Attendance/SelfHolidayExplorer.js

@@ -463,7 +463,7 @@ MWF.xApplication.Attendance.SelfHolidayExplorer.SelfHoliday = new Class({
         if (data.organizationName && data.employeeName && data.leaveType && data.startTime && data.endTime && data.leaveDayNumber){
             this.app.restActions.saveSelfHoliday(data, function(json){
                 if( json.type == "ERROR" ){
-                    this.app.notice( json.userMessage  , "error");
+                    this.app.notice( json.message  , "error");
                 }else{
                     this.createMarkNode.destroy();
                     this.createAreaNode.destroy();

x_desktop_web/x_component_Attendance/StatisticsCycleExplorer.js

@@ -369,7 +369,7 @@ MWF.xApplication.Attendance.StatisticsCycleExplorer.StatisticsCycle = new Class(
         if (data.cycleStartDateString && data.cycleEndDateString ){
             this.app.restActions.saveCycle(data, function(json){
                 if( json.type == "ERROR" ){
-                    this.app.notice( json.userMessage  , "error");
+                    this.app.notice( json.message  , "error");
                 }else{
                     this.createMarkNode.destroy();
                     this.createAreaNode.destroy();

x_desktop_web/x_component_Execution/$CoreWork/default/css.wcss

@@ -0,0 +1,298 @@
+{
+  "formMarkNode": {
+    "width": "100%",
+    "height": "100%",
+    "opacity": 0.6,
+    "position": "absolute",
+    "background-color": "#CCC",
+    "top": "0px",
+    "left": "0px"
+  },
+  "formAreaNode": {
+    "position": "absolute",
+    "opacity": 0,
+    "top": "0px"
+  },
+  "formNode": {
+    "background-color": "#FFF",
+    "box-shadow": "0px 0px 10px #999",
+    "margin": "auto",
+    "border": "1px solid #fff",
+    "overflow": "hidden"
+  },
+  "formTopNode": {
+    "color" : "#fff",
+    "height": "40px",
+    "background-color": "#3d77c1",
+    "border-top": "1px solid #ddd",
+    "border-bottom": "1px solid #b6b6b6",
+    "line-height": "40px",
+    "font-size": "14px",
+    "padding-left" : "5px",
+    "text-align": "left"
+  },
+  "formTopIconNode" : {
+    "width": "32px",
+    "height": "32px",
+    "float": "left",
+    "background": "url(/x_component_Execution/$CoreWork/default/icon/document.png) no-repeat center 4px"
+  },
+  "formTopTextNode" : {
+    "font-size": "16px",
+    "float": "left"
+  },
+  "formTopCloseActionNode": {
+    "width": "32px",
+    "height": "32px",
+    "float": "right",
+    "padding-left" : "30px",
+    "padding-right" : "10px",
+    "background": "url(/x_component_Execution/$CoreWork/default/icon/close.png) no-repeat center 4px",
+    "cursor": "pointer"
+  },
+  "formTopContentNode" : {
+    "float" : "right",
+    "padding-right" : "10px",
+    "text-align" : "right"
+  },
+  "formTopContentTitle" : {
+  },
+  "formTopContentValue" : {
+    "padding-right" : "20px",
+    "font-size": "12px"
+  },
+  "formNewNode": {
+    "width": "47px",
+    "height": "47px",
+    "background": "url(/x_component_Template/$Explorer/default/icon/new.png) no-repeat"
+  },
+  "formIconNode": {
+    "width": "47px",
+    "height": "47px"
+  },
+  "formEditNode": {
+    "width": "47px",
+    "height": "47px"
+  },
+  "formContentNode": {
+    "border": "0px solid #666",
+    "width": "100%",
+    "margin": "auto",
+    "font-size": "12px",
+    "color": "#666",
+    "font-family": "微软雅黑",
+    "overflow" : "hidden"
+  },
+  "formTableContainer" : {
+    "margin": "0px 10px",
+    "overflow" : "hidden",
+    "positon" : "static"
+  },
+  "formBottomNode" : {
+    "height" : "40px",
+    "line-height" : "40px",
+    "background-color" : "#3d77c1",
+    "overflow" : "hidden",
+    "padding-top" : "10px"
+  },
+  "formOkActionNode": {
+    //"margin-top" : "5px",
+    "height": "30px",
+    "width": "75px",
+    "cursor": "pointer",
+    "float": "right",
+    "line-height": "30px",
+    "text-align": "center",
+    "font-size": "16px",
+    "font-family": "微软雅黑",
+    "border": "1px solid #3d77c1",
+    "background-color" : "#5d97e1",
+    "color": "#FFF",
+    "margin-right": "20px",
+    "box-shadow": "0px 0px 3px #5d97e1"
+  },
+  "formCancelActionNode": {
+    //"margin-top" : "5px",
+    "height": "30px",
+    "width": "75px",
+    "cursor": "pointer",
+    "float": "right",
+    "line-height": "30px",
+    "text-align": "center",
+    "font-size": "16px",
+    "font-family": "微软雅黑",
+    "border": "1px solid #3d77c1",
+    "background-color" : "#5d97e1",
+    "color": "#FFF",
+    "margin-right": "20px",
+    "box-shadow": "0px 0px 3px #5d97e1"
+  },
+
+  "workContentArea" : {
+    "margin" : "20px 10px",
+    "min-height" : "100px",
+    "border" : "1px solid #ccc",
+    "position" : "relative"
+  },
+  "workContentTitleNode" : {
+    "text-align" : "center",
+    "position" : "absolute",
+    "left" : "20px",
+    "top" : "-10px",
+    "background-color" : "#fff",
+    "height" : "20px",
+    "width" : "100px"
+  },
+  "workContentNode" : {
+    "margin-top":"10px"
+  },
+
+  "coreWorkInforTable" : {
+
+  },
+  "coreWorkInforTitle" : {
+    "padding-left" : "15px",
+    "font-size" : "12px",
+    "font-weight" : "bold",
+    "color" : "#555",
+    "min-width" : "100px"
+  },
+  "coreWorkInforValue" : {
+    "color" : "#666"
+  },
+  "coreWorkInforTitleDiv" : {
+    "padding-left" : "10px",
+    "font-size" : "12px",
+    "font-weight" : "bold",
+    "color" : "#555",
+    "min-width" : "100px"
+  },
+  "coreWorkInforValueDiv" : {
+    "color" : "#666",
+    "min-width" : "100px",
+    "margin-right" : "40px"
+  },
+
+  "viewHeadNode": {
+    "width":"100%",
+    "height": "20px",
+    "background-color": "#fff",
+    "color": "#666666",
+    "line-height": "30px",
+    "font-family": "微软雅黑",
+    "font-size": "14px"
+  },
+
+  "normalThNode" : {
+    "background-color" : "#fff",
+    "text-align":"center",
+    "border-bottom": "1px solid #cfecf5",
+    "font-weight" : "normal"
+  },
+  "sortIconNode" : {
+    "height": "16px",
+    "width": "16px",
+    "line-height": "20px",
+    "margin-top": "5px",
+    //"float": "left",
+    "display":"inline-block",
+    "margin-right": "5px",
+    "background-position" : "center center",
+    "background-repeat" : "no-repeat",
+    "background-image" : "url(/x_component_Template/$Explorer/default/icon/dblsort.gif)"
+  },
+  "sortIconNode_asc" : {
+    "height": "16px",
+    "width": "16px",
+    "line-height": "20px",
+    "margin-top": "5px",
+    //"float": "left",
+    "display":"inline-block",
+    "margin-right": "5px",
+    "background-position" : "center center",
+    "background-repeat" : "no-repeat",
+    "background-image" : "url(/x_component_Template/$Explorer/default/icon/dblasc.gif)"
+  },
+  "sortIconNode_desc" : {
+    "height": "16px",
+    "width": "16px",
+    "line-height": "20px",
+    "margin-top": "5px",
+    //"float": "left",
+    "display":"inline-block",
+    "margin-right": "5px",
+    "background-position" : "center center",
+    "background-repeat" : "no-repeat",
+    "background-image" : "url(/x_component_Template/$Explorer/default/icon/dbldesc.gif)"
+  },
+
+
+  "documentNode":{
+    "min-height": "29px",
+    "overflow": "hidden",
+    "color": "#666666",
+    //"line-height": "39px",
+    "cursor": "pointer",
+    "font-family": "微软雅黑",
+    "font-size": "12px",
+    "background-color": "#fff"
+  },
+  "documentNode_noread": {
+    "background-color": "#fcfcfc"
+  },
+  "documentNode_over": {
+    "background-color": "#f5f6f7"
+  },
+  "documentNode_remove": {
+    "background-color": "#ffcccc"
+  },
+
+  "documentActionNode": {
+    "height": "20px",
+    "width": "20px",
+    "line-height": "20px",
+    "color": "#0066cc",
+    "cursor": "pointer",
+    "margin-right": "5px"
+  },
+  "documentActionNode_over":{
+    "color": "#003399"
+  },
+  "documentActionNode_down":{
+    "color": "#000"
+  },
+
+  "normalTdNode" : {
+    "min-height": "30px",
+    "padding-left" : "10px",
+    "text-align":"left",
+    "overflow" : "hidden",
+    //"font-weight" : "bold",
+    //"border-top": "1px solid #FFF",
+    "border-top": "1px dashed #cfecf5"
+  },
+  "normalTdCenterNode" : {
+    "min-height": "30px",
+    "padding-left" : "10px",
+    "text-align":"center",
+    "overflow" : "hidden",
+    //"font-weight" : "bold",
+    //"border-top": "1px solid #FFF",
+    "border-top": "1px dashed #cfecf5"
+  },
+  "documentSubject" : {
+    "font-size" : "14px",
+    "font-weight" : "bold",
+    "color" : "#003399"
+  },
+  "itemBlock" : {
+    "overflow" : "hidden",
+    "display" : "block"
+  },
+  "itemInLine" : {
+    "float" : "left",
+    "font-color" : "#888",
+    "padding-right" : "10px",
+    "padding-top" : "5px"
+  }
+}

x_desktop_web/x_component_Execution/$CoreWork/listItem.json

@@ -0,0 +1,134 @@
+{
+  "viewSetting": {
+    "html": "<table width='100%' border='0' cellpadding='5' cellspacing='0' styles='editTable'></table>"
+  },
+  "headSetting": {
+    "html": "<tr styles='viewHeadNode'></tr>"
+  },
+  "documentSetting": {
+    "html": "<tr styles='documentNode'></tr>",
+    "mouseoverStyles": "documentNode_over",
+    "action": "open"
+  },
+  "items": [
+//    {
+//      "name": "$checkbox",
+//      "head": {
+//        "html": "<th styles='normalThNode'></th>",
+//        "width": "5%"
+//      },
+//      "content": {
+//        "html": "<td styles='normalTdNode'></td>",
+//        //"condition": "function(d){ return d.status==0 ? true : false }",
+//        "value": ""
+//      }
+//    },
+    {
+      "name": "subject",
+      "head": {
+        "html": "<th styles='normalThNode' lable='subject'></th>",
+        "width": "40%"
+      },
+      "content": {
+        "html": "<td styles='normalTdNode'>" +
+        " <div item='subject' styles='documentSubject'></div>" +
+        " <div>" +
+        "   <div item='defaultWorkType' styles='itemInLine'></div><div item='defaultWorkLevel' styles='itemInLine'></div>" +
+        " </div>" +
+        "</td>",
+        "items": {
+          "subject": {},
+          "defaultWorkType": {},
+          "defaultWorkLevel": {}
+        }
+      }
+    },
+    {
+      "name": "relativeDepartment",
+      "head": {
+        "html": "<th styles='normalThNode' lable='relativeDepartment'></th>",
+        "width": "20%"
+      },
+      "content": {
+        "html": "<td styles='normalTdNode'>"  +
+        " <div styles='itemBlock'><div styles='itemInLine' lable='dutyDepartent' colon='true'></div><div styles='itemInLine' item='dutyDepartent'></div></div>" +
+        " <div styles='itemBlock'><div styles='itemInLine' lable='doDepartment' colon='true'></div><div styles='itemInLine' item='doDepartment'></div></div>" +
+        " <div styles='itemBlock'><div styles='itemInLine' lable='secondDepartment' colon='true'></div><div styles='itemInLine' item='secondDepartment'></div></div>" +
+        "</td>",
+        "items": {
+          "dutyDepartent": {
+            "value": "function(d){ return d.dutyDepartent }"
+          },
+          "doDepartment": {},
+          "secondDepartment": {}
+        }
+      }
+    },
+    {
+      "name": "relativePerson",
+      "head": {
+        "html": "<th styles='normalThNode' lable='relativePerson'></th>",
+        "width": "15%"
+      },
+      "content": {
+        "html": "<td styles='normalTdNode'>" +
+        " <div styles='itemBlock'><div styles='itemInLine' lable='dutyPerson' colon='true'></div><div styles='itemInLine' item='dutyPerson'></div></div>" +
+        " <div styles='itemBlock'><div styles='itemInLine' lable='doPerson' colon='true'></div><div styles='itemInLine' item='doPerson'></div></div>" +
+        " <div styles='itemBlock'><div styles='itemInLine' lable='secondPerson' colon='true'></div><div styles='itemInLine' item='secondPerson'></div></div>" +
+        "</td>",
+        "items": {
+          "dutyPerson": {},
+          "doPerson": {},
+          "secondPerson": {}
+        }
+      }
+    },
+    {
+      "name": "timeLimit",
+      "head": {
+        "html": "<th styles='normalThNode' lable='timeLimit'></th>",
+        "width": "15%"
+      },
+      "content": {
+        "html": "<td styles='normalTdCenterNode' item='timeLimit'></td>",
+        "items": {
+          "timeLimit" : {}
+        }
+      }
+    },
+    {
+      //"access": "admin",
+      "head": {
+        "html": "<th styles='normalThNode' lable='action'></th>",
+        "width": "10%"
+      },
+      "content": {
+        "html": "<td styles='normalTdCenterNode'>" +
+        " <span styles='documentActionNode' item='action_comfirm'></span>" +
+        " <span styles='documentActionNode' item='action_split'></span>" +
+        "</td>",
+        "items": {
+          "action_comfirm": {
+            //"access": "admin",
+            "title": "comfirm",
+            "text": "comfirm",
+            "action": "action_comfirm",
+            "styles": "documentActionNode",
+            "mouseoverStyles": "documentActionNode_over",
+            "mousedownStyles": "documentActionNode_down"
+          },
+          "action_split": {
+            "title": "split",
+            "text": "split",
+            "action": "action_split",
+            "condition": "function( d ){ return true }",
+            "styles": "documentActionNode",
+            "mouseoverStyles": "documentActionNode_over",
+            "mousedownStyles": "documentActionNode_down"
+          }
+        }
+      }
+    }
+  ]
+}
+

x_desktop_web/x_component_Execution/$Explorer/default/css.wcss

@@ -0,0 +1,359 @@
+{
+  "toolbarNode": {
+    "width":"100%",
+    "overflow": "hidden",
+    //"border-bottom": "1px solid #999",
+    "margin-left" : "1px",
+    "height": "38px",
+    "margin-bottom": "10px",
+    "padding-left" :"5px",
+    "background-color": "#476783"
+    //"background-color": "#EEE"
+  },
+
+  "toolbarItemNode": {
+    //"width": "68px",
+    "height": "25px",
+    "line-height": "25px",
+    "float": "left",
+    "margin-left": "5px",
+    "margin-top": "4px",
+    "padding-right": "8px",
+    "cursor": "pointer",
+    "background-color": "#FFF",
+    "border": "1px solid #AAA",
+    "line-height": "normal",
+    "color":"#666",
+    "border-radius":"3px"
+  },
+  "toolbarItemRightNode": {
+    //"width": "68px",
+    "height": "25px",
+    "line-height": "25px",
+    "float": "right",
+    "margin-right": "15px",
+    "margin-top": "4px",
+    "padding-right": "8px",
+    "cursor": "pointer",
+    "background-color": "#FFF",
+    "border": "1px solid #AAA",
+    "line-height": "normal",
+    "color":"#666",
+    "border-radius":"3px"
+  },
+  "toolbarItemNode_over": {
+    "background-color": "#FFF",
+    "border": "2px solid #FFF"
+  },
+  "toolbarItemNode_current": {
+    "background-color": "#FFF",
+    "border": "2px solid #FFF"
+  },
+  "toolbarItemNode_down": {
+    "border-top": "2px solid #CCC",
+    "border-left": "2px solid #CCC",
+    "border-right": "2px solid #FFF",
+    "border-bottom": "2px solid #FFF",
+    "background-color": "#FFF"
+  },
+  "toolbarItemIconNode": {
+    "width": "30px",
+    "height": "25px",
+    "float" :"left",
+    "background-repeat": "no-repeat",
+    "background-position": "8px center"
+  },
+  "toolbarItemTextNode": {
+    "float":"left",
+    "text-align": "left",
+    "line-height" :"25px",
+    "font-family": "微软雅黑",
+    "font-size": "14px"
+  },
+  "toolbarSeparatorNode": {
+    "float":"left",
+    "border-left" : "1px solid #fff"
+  },
+
+  "fileterNode": {
+    "overflow": "hidden",
+    //"border-bottom": "1px solid #999",
+    "margin-left" : "10px",
+    "margin-right" : "20px",
+    "height": "38px",
+    "margin-bottom": "5px",
+    "margin-top": "5px",
+    "padding-left" :"5px",
+    "background-color": "#fff",
+    "border-bottom" : "1px solid #ddd"
+
+    //"background-color": "#EEE"
+  },
+  "filterTable" : {
+    "width" : "600px",
+    "color" : "#666",
+    "font-size" : "14px"
+  },
+  "filterTableTitle" : {
+    "text-align" : "right"
+  },
+  "filterTableValue" : {
+    "text-align" : "left"
+  },
+  "filterButton" :{
+    "cursor" : "pointer",
+    "height" : "24px",
+    "line-height" : "24px",
+    "background-color" : "#fff",
+    "border" : "1px solid #ccc"
+  },
+
+  //  "viewViewNode": {
+//    "margin-left":"8px",
+//    "line-height": "24px"
+//  },
+//  "viewNode": {
+//    "float": "left",
+//    "margin-top" : "5px",
+//    "margin-left": "10px",
+//    "margin-right": "10px",
+//    "color": "#666",
+//    "cursor": "pointer",
+//    "font-size": "14px",
+//    "font-weight": "normal"
+//  },
+//  "viewNode_current": {
+//    "float": "left",
+//    "margin-top" : "5px",
+//    "margin-left": "10px",
+//    "margin-right": "10px",
+//    "color": "#666",
+//    "cursor": "pointer",
+//    "font-size": "16px",
+//    "font-weight": "bold"
+//  },
+
+  "viewContainerNode": {
+    "overflow": "hidden",
+    "position": "static",
+    "margin": "0px 10px"
+  },
+  "viewContentListNode": {
+    "overflow": "hidden",
+    "padding-bottom": "20px",
+    "margin-right": "10px"
+  },
+  "noElementNode": {
+    "text-align": "center",
+    "padding": "20px",
+    "height": "60px",
+    "line-height": "60px",
+    "margin-top": "10px",
+    "margin-left": "0px",
+    "color": "#888",
+    "cursor": "pointer",
+    "font-size": "16px"
+  },
+
+
+  "viewHeadNode": {
+    "width":"100%",
+    "height": "30px",
+    "background-color": "#f1f3fc",
+    "color": "#666666",
+    "font-weight": "bold",
+    "line-height": "30px",
+    "font-family": "微软雅黑",
+    "font-size": "14px"
+  },
+
+  "normalThNode" : {
+    "background-color" : "#f1f3fc",
+    "text-align":"center",
+    "height": "30px",
+    "border-top": "1px solid #FFF"
+  },
+  "normalTdNode" : {
+    "height": "30px",
+    "text-align":"center",
+    "overflow" : "hidden",
+    //"font-weight" : "bold",
+    "border-top": "1px solid #FFF",
+    "border-bottom": "1px solid #CCC"
+  },
+
+  "sortIconNode" : {
+    "height": "16px",
+    "width": "16px",
+    "line-height": "20px",
+    "margin-top": "5px",
+    //"float": "left",
+    "display":"inline-block",
+    "margin-right": "5px",
+    "background-position" : "center center",
+    "background-repeat" : "no-repeat",
+    "background-image" : "url(/x_component_Execution/$Explorer/default/icon/dblsort.gif)"
+  },
+  "sortIconNode_asc" : {
+    "height": "16px",
+    "width": "16px",
+    "line-height": "20px",
+    "margin-top": "5px",
+    //"float": "left",
+    "display":"inline-block",
+    "margin-right": "5px",
+    "background-position" : "center center",
+    "background-repeat" : "no-repeat",
+    "background-image" : "url(/x_component_Execution/$Explorer/default/icon/dblasc.gif)"
+  },
+  "sortIconNode_desc" : {
+    "height": "16px",
+    "width": "16px",
+    "line-height": "20px",
+    "margin-top": "5px",
+    //"float": "left",
+    "display":"inline-block",
+    "margin-right": "5px",
+    "background-position" : "center center",
+    "background-repeat" : "no-repeat",
+    "background-image" : "url(/x_component_Execution/$Explorer/default/icon/dbldesc.gif)"
+  },
+
+  "documentNode": {
+    "overflow": "hidden",
+    "background-color": "#fcfcfc",
+    "min-height": "29px",
+    "overflow": "hidden",
+    "color": "#666666",
+    //"line-height": "39px",
+    "cursor": "pointer",
+    "font-family": "微软雅黑",
+    "font-size": "12px"
+  },
+  "documentNode_noread": {
+    "background-color": "#fcfcfc"
+  },
+  "documentNode_over": {
+    "background-color": "#f5f6f7"
+  },
+  "documentNode_remove": {
+    "background-color": "#ffcccc"
+  },
+
+  "documentNode":{
+    "background-color": "#fcfcfc",
+    "min-height": "29px",
+    "overflow": "hidden",
+    "color": "#666666",
+    //"line-height": "39px",
+    "cursor": "pointer",
+    "font-family": "微软雅黑",
+    "font-size": "12px"
+  },
+
+  "documentActionNode": {
+    "height": "20px",
+    "border-radius": "3px",
+    "border": "1px solid #666",
+    "width": "20px",
+    "line-height": "20px",
+    "margin-top": "10px",
+    "box-shadow": "1px 1px 2px #CCC",
+    "color": "#888",
+    "cursor": "pointer",
+    "float": "left",
+    "margin-right": "5px",
+    "background": "no-repeat center center",
+    "background-image" : "url(/x_component_Execution/$Explorer/default/icon/delete.png)"
+  },
+  "documentActionNode_over":{
+    "box-shadow": "1px 1px 2px #999",
+    "background": "no-repeat center center",
+    "background-image": "url(/x_component_Execution/$Explorer/default/icon/delete_over.png)",
+    "background-color": "#666"
+  },
+  "documentActionNode_down":{
+    "box-shadow": "-1px -1px 3px #999 inset"
+  },
+
+
+  "formMarkNode": {
+    "width": "100%",
+    "height": "100%",
+    "opacity": 0.6,
+    "position": "absolute",
+    "background-color": "#CCC",
+    "top": "0px",
+    "left": "0px"
+  },
+  "formAreaNode": {
+    "position": "absolute",
+    "opacity": 0,
+    "top": "0px"
+  },
+  "formNode": {
+    "background-color": "#FFF",
+    "width": "80%",
+    "max-width": "600px",
+    "box-shadow": "0px 0px 20px #999",
+    "margin": "auto",
+    "border-radius": "8px",
+    "border": "6px solid #666",
+    "overflow": "hidden"
+  },
+  "formNewNode": {
+    "width": "47px",
+    "height": "47px",
+    "background": "url(/x_component_Execution/$Explorer/default/icon/new.png) no-repeat"
+  },
+  "formIconNode": {
+    "width": "47px",
+    "height": "47px"
+  },
+  "formEditNode": {
+    "width": "47px",
+    "height": "47px"
+  },
+  "formFormNode": {
+    "border-radius": "8px",
+    "border": "0px solid #666",
+    "width": "70%",
+    "margin": "auto",
+    "font-size": "16px",
+    "color": "#666",
+    "font-family": "微软雅黑"
+  },
+  "formOkActionNode": {
+    "height": "30px",
+    "width": "85px",
+    "cursor": "pointer",
+    "float": "right",
+    "line-height": "30px",
+    "padding-left": "65px",
+    "font-size": "16px",
+    "font-family": "微软雅黑",
+    "border-radius": "3px",
+    "border": "1px solid #354f67",
+    "color": "#FFF",
+    "margin-right": "20px",
+    "margin-top": "20px",
+    "box-shadow": "0px 0px 0px #666",
+    "background": "url(/x_component_Execution/$Explorer/default/icon/editOk_bg.png) no-repeat"
+  },
+  "formCancelActionNode": {
+    "height": "30px",
+    "width": "60px",
+    "cursor": "pointer",
+    "float": "right",
+    "line-height": "30px",
+    "padding-left": "40px",
+    "font-size": "16px",
+    "font-family": "微软雅黑",
+    "border-radius": "3px",
+    "color": "#FFF",
+    "margin-top": "20px",
+    "box-shadow": "0px 0px 0px #666",
+    "border": "1px solid #999",
+    "background": "url(/x_component_Execution/$Explorer/default/icon/editCancel_bg.png) no-repeat"
+  }
+}

x_desktop_web/x_component_Execution/$Explorer/listItem.json

@@ -0,0 +1,100 @@
+[
+  {
+    "title" : "",
+    "headStyles" : "normalThNode",
+    "contentStyles" : "normalTdNode",
+    "item" : "checkbox",
+    "name" : "checkbox",
+    "condition" : "function(d){ return d.status==0 ? true : false }",
+    "width" : "5%"
+  },
+  {
+    "title" : "姓名",
+    "headStyles" : "normalThNode",
+    "contentStyles" : "normalTdNode",
+    "item" : "empName",
+    "name" : "empName",
+    "width" : "15%"
+  },
+  {
+    "title" : "日期",
+    "headStyles" : "normalThNode",
+    "contentStyles" : "normalTdNode",
+    //"sort" : "desc,asc",
+    "defaultSort" : "desc",
+    "item" : "recordDateString",
+    "name" : "recordDateString",
+    "width" : "15%"
+  },
+
+  {
+    "title" : "说明",
+    "headStyles" : "normalThNode",
+    "contentStyles" : "normalTdNode",
+    "item" : "function( data ){ if(data.isHoliday){return '节假日'}else if(data.isWeekend){return '周末'}else if(data.isWorkday){return '调休工作日'}else{return '工作日'}  }",
+    "name" : "description",
+    "width" : "10%"
+  },
+
+  {
+    "title" : "上班打卡时间",
+    "headStyles" : "normalThNode",
+    "contentStyles" : "normalTdNode",
+    "item" : "onDutyTime",
+    "name" : "onDutyTime",
+    "width" : "15%"
+  },
+  {
+    "title" : "下班打卡时间",
+    "headStyles" : "normalThNode",
+    "contentStyles" : "normalTdNode",
+    "item" : "offDutyTime",
+    "name" : "offDutyTime",
+    "width" : "15%"
+  },
+  {
+    "title": "考勤状态",
+    "headStyles": "normalThNode",
+    "contentStyles": "normalTdNode",
+    "item": "function( d ){  var status=''; if(d.isGetSelfHolidays){ status = '请假' }else if(d.isAbsent){ status = '缺勤' }else if(d.isLate){ status = '迟到' }else if(d.isLeaveEarlier){ status = '早退' }else{ status = '正常' }; return status; }",
+    "name" : "status",
+    "width" : "10%"
+  } ,
+  {
+    "title": "申诉状态",
+    "headStyles": "normalThNode",
+    "contentStyles": "normalTdNode",
+    "item": "function( d ){  if(d.appealStatus==1){ return '申诉中' }else if(d.appealStatus==-1){ return '申诉未通过' }else if(d.appealStatus==9){ return '申诉通过' }else{ return '' } }",
+    "name" : "appealStatus",
+    "width" : "10%"
+  },
+  {
+    "access" : "admin",
+    "title" : "申诉",
+    "headStyles" : "normalThNode",
+    "contentStyles" : "normalTdNode",
+    "item" : "actions",
+    "name" : "actions",
+    "width" : "10%",
+    "sub" : [{
+      "access" : "admin",
+      "title" : "删除",
+      "action" : "remove",
+//      "styles" : "actionAppealNode",
+//      "overStyles" : "actionAppealNode_over",
+//      "downStyles" : "actionAppealNode_down",
+      "styles" : "documentActionNode",
+      "overStyles" : "documentActionNode_over",
+      "downStyles" : "documentActionNode_down",
+      "icon" : "delete.png",
+      "overIcon" : "delete_over.png"
+    },{
+      "title" : "查看申诉信息",
+      "action" : "seeAppeal",
+      "condition" : "function( d ){ if( d.appealStatus ){ return true }else{ return false } }",
+      "styles" : "documentActionDeleteNode",
+      "overStyles" : "documentActionDeleteNode_over",
+      "downStyles" : "documentActionDeleteNode_down"
+    }]
+  }
+]

x_desktop_web/x_component_Execution/$Explorer/toolbar.json

@@ -0,0 +1,13 @@
+[
+  {
+    "access" : "admin",
+    "title": "新建信息",
+    "id": "1.1",
+    "action": "createDocument",
+    "icon": "create.png",
+    "expand": false,
+    "position" : "left",
+    "styles" : "toolbarItemNode",
+    "sub": []
+  }
+]

x_desktop_web/x_component_Execution/$MForm/default/css.wcss

@@ -0,0 +1,57 @@
+{
+  "inputText": {
+    "width": "99%",
+    "border":"1px solid #999",
+    "background-color":"#FFF",
+    "border-radius": "3px",
+    "box-shadow": "0px 0px 6px #CCC",
+    "height": "26px"
+  },
+  "inputTime" : {
+    "width": "99%",
+    "border":"1px solid #999",
+    "background-color":"#FFF",
+    "border-radius": "3px",
+    "box-shadow": "0px 0px 6px #CCC",
+    "height": "26px",
+    "background" : "url(/x_component_Execution/$MForm/default/icon/calendar.png) 98% center no-repeat"
+  },
+  "inputPerson" : {
+    "width": "99%",
+    "border":"1px solid #999",
+    "background-color":"#FFF",
+    "border-radius": "3px",
+    "box-shadow": "0px 0px 6px #CCC",
+    "height": "26px",
+    "background" : "url(/x_component_Execution/$MForm/default/icon/selectperson.png) 98% center no-repeat"
+  },
+  "inputTextarea" : {
+    "width": "99%",
+    "border":"1px solid #999",
+    "background-color":"#FFF",
+    "border-radius": "3px",
+    "box-shadow": "0px 0px 6px #CCC",
+    "height": "40px"
+  },
+
+  "formTable" : {
+
+  },
+  "formTableHead" : {
+    "height": "50px",
+    "line-height": "50px",
+    "text-align": "center",
+    "min-width": "80px",
+    "font-size":"20px",
+    "font-weight": "bold"
+  },
+  "formTableTitle" : {
+    "height": "30px",
+    "line-height": "30px",
+    "text-align": "left"
+  },
+  "formTableValue" : {
+    "text-align": "left"
+  }
+}
+

x_desktop_web/x_component_Execution/$MForm/filter/css.wcss

@@ -0,0 +1,42 @@
+{
+  "inputText": {
+
+  },
+  "inputTime" : {
+
+  },
+  "inputPerson" : {
+
+  },
+  "inputTextarea" : {
+
+  },
+  "inputButton" : {
+    "cursor" : "pointer",
+    "height" : "24px",
+    "line-height" : "24px",
+    "background-color" : "#fff",
+    "border" : "1px solid #ccc"
+  },
+  "formTable" : {
+    "font-size" : "14px",
+    "margin-left" : "10px"
+  },
+  "formTableHead" : {
+    "height": "50px",
+    "line-height": "50px",
+    "text-align": "center",
+    "min-width": "80px",
+    "font-size":"20px",
+    "font-weight": "bold"
+  },
+  "formTableTitle" : {
+    "height": "30px",
+    "line-height": "30px",
+    "text-align": "right"
+  },
+  "formTableValue" : {
+    "text-align": "left"
+  }
+}
+

x_desktop_web/x_component_Execution/$MForm/popup/css.wcss

@@ -0,0 +1,63 @@
+{
+  "inputText": {
+    "width": "99%",
+    "border":"1px solid #999",
+    "background-color":"#FFF",
+    "border-radius": "3px",
+    "height": "18px"
+  },
+  "inputTime" : {
+    "width": "99%",
+    "border":"1px solid #999",
+    "background-color":"#FFF",
+    "border-radius": "3px",
+    "height": "18px",
+    "background" : "url(/x_component_Execution/$MForm/default/icon/calendar.png) 99% center no-repeat"
+  },
+  "inputPerson" : {
+    "width": "99%",
+    "border":"1px solid #999",
+    "background-color":"#FFF",
+    "border-radius": "3px",
+    "height": "18px",
+    "background" : "url(/x_component_Execution/$MForm/default/icon/selectperson.png)  99% center no-repeat"
+  },
+  "inputTextarea" : {
+    "width": "99%",
+    "border":"1px solid #999",
+    "background-color":"#FFF",
+    "border-radius": "3px",
+    "height": "32px"
+  },
+
+  "formTable" : {
+    "border" : "1px solid #ccc",
+    "border-collapse" : "collapse",
+    "font-size" : "12px"
+  },
+  "formTableHead" : {
+    "height": "50px",
+    "line-height": "50px",
+    "text-align": "center",
+    "min-width": "80px",
+    "font-size":"20px",
+    "font-weight": "bold",
+    "border" : "1px solid #ccc",
+    "border-collapse" : "collapse"
+  },
+  "formTableTitle" : {
+    "height": "30px",
+    "background-color" : "#eee",
+    "line-height": "30px",
+    "text-align": "left",
+    "border" : "1px solid #ccc",
+    "border-collapse" : "collapse"
+  },
+  "formTableValue" : {
+    "text-align": "left",
+    "border" : "1px solid #ccc",
+    "border-collapse" : "collapse",
+    "min-width" : "60px"
+  }
+}
+

x_desktop_web/x_component_Execution/$WorkDetail/default/css.wcss

@@ -295,6 +295,7 @@
   },
   "processInfoContent":{
     "margin-left":"10px",
+    "padding-right":"5px",
     "margin-bottom":"20px",
     "font-size":"12px"
   },
@@ -345,7 +346,7 @@
     "float": "left"
   },
   "chatContentNode":{
-    "min-height" : "580px",
+    //"min-height" : "580px",
     "background-color" : "#f2f2f2"
   },
   "chatContentListNode":{
@@ -390,6 +391,10 @@
   "prevContentValueDiv":{
     "margin":"0px 20px"
   },
+  "reportLeaderContentDiv":{
+    "border-bottom":"1px dashed #3c76c1",
+    "padding-top":"10px"
+  },
 
   "authDiv":{
     "width":"100%","color":"#f6ac0d","font-weight":"bold","margin-left":"10px","margin-top":"5px"

x_desktop_web/x_component_Execution/$WorkList/default/css.wcss

@@ -0,0 +1,455 @@
+{
+  "naviDiv":{
+    "position":"absolute","width":"130px","height":"616px","background-color":"#203140"
+  },
+  "naviTitleDiv":{
+    "background-color":"#006666", "color":"#008f8f","font-size":"18px","text-align":"center","height":"65px","line-height":"65px"
+  },
+  "naviContentLi":{
+    "margin-top":"20px",
+    "cursor":"pointer"
+  },
+  "naviContentImg":{
+    "width":"70px","height":"70px","display":"block","margin":"0px auto"
+  },
+  "naviContentSpan":{
+    "display":"block","text-align":"center"
+  },
+  "naviContentDiv":{
+    "height":"480px","list-style-type":"none","color":"#ffffff","font-size":"14px"
+  },
+  "contentDiv":{
+    "margin-left":"130px","height":"616px", "background-color":"#ffffff","min-width":"1000px","font-size":"14px"
+  },
+  "rightCategoryDiv":{
+    "width":"100%","height":"65px","border":"0px solid #f00","min-width":"1000px","border-bottom":"1px dashed #cccccc"
+  },
+  "rightCategoryNewDiv":{
+    "position":"absolute","width":"145px","height":"45px","margin":"10px", "background-color":"#3d77c1","height":"45px","line-height":"45px","text-align":"center","color":"#ffffff","font-size":"14px",
+    "cursor":"pointer"
+  },
+  "rightCategoryItemDiv":{
+    "margin-left":"165px","height":"45px","min-width":"950px","list-style-type":"none","color":"#3c76c1","font-size":"16px"
+  },
+  "rightCategoryItemLi":{
+    "margin":"0 50px","line-height":"65px","width":"100px","text-align":"center","float":"left","cursor":"pointer"
+  },
+  "rightCategoryItemCurrentLi":{
+    "margin":"0 50px","line-height":"65px","width":"100px","border-bottom":"2px solid #124c93","text-align":"center","float":"left","cursor":"pointer"
+  },
+//  "rightDrafterDiv":{
+//    "width":"100%","border":"0px solid #f00","min-width":"1000px","float":"left","margin-bottom":"10px"
+//  },
+//  "rightDrafterTabLi":{
+//    "width":"90px","height":"30px","background-color":"#3c76c1","color":"#ffffff","display":"block","margin-left":"10px"
+//  },
+//  "rightDeployTabLi":{
+//    "width":"90px","height":"30px","background-color":"#3c76c1","color":"#ffffff","display":"block","margin-left":"10px"
+//  },
+  "rightDrafterDiv":{
+    "width":"100%","border":"0px solid #f00","min-width":"1000px","float":"left","margin-bottom":"0px","padding-left":"10px"
+  },
+  "rightDrafterTabLi":{
+    "display":"inline-block","width":"80px","height":"30px","text-align":"center","line-height":"30px","cursor":"pointer","color":"#999999"
+  },
+  "rightDeployTabLi":{
+    "display":"inline-block","width":"80px","height":"30px","text-align":"center","line-height":"30px","cursor":"pointer","border-bottom":"2px solid #124c93","color":"#999999"
+  },
+  "rightArchiveTabLi":{
+    "display":"inline-block","width":"80px","height":"30px","text-align":"center","line-height":"30px","cursor":"pointer","color":"#999999"
+  },
+  "rightSearchDiv":{
+    "width":"100%","border":"0px solid #f00","min-width":"1000px","float":"left","margin-bottom":"10px","padding-left":"10px"
+  },
+  "rightSearchBarDiv":{
+    "margin-left":"165px",  "height":"45px","padding-top":"10px","min-width":"950px"
+  },
+  "rightDrafterTabSpan":{"width":"90px","height":"30px","background-color":"#3c76c1","color":"#ffffff","cursor":"pointer"},
+  "rightSearchBarSpan":{
+    "height":"45px","line-height":"45px","margin-left":"10px","font-size":"12px","color":"#999999"
+  },
+  "rightSearchBarSelect":{
+    "color":"#999999","border":"1px solid #999999","height":"25px","line-height":"25px"
+  },
+  "rightSearchBarInput":{
+    "height":"25px","line-height":"25px","border":"1px solid #999999","width":"230px","color":"#999999","font-size":"14px"
+  },
+  "rightSearchBarSearch":{
+    "margin": "7px",
+    "width": "60px", "height": "30px",
+    "text-align": "center",
+    "color": "#ffffff",
+    "line-height": "30px",
+    "font-size": "14px",
+    //"position": "absolute",
+    "cursor": "pointer",
+    "background-color": "rgb(61, 119, 193)",
+    "display":"inline-block"
+  },
+  "rightSearchBarReset":{
+    "margin": "7px",
+    "width": "60px", "height": "30px",
+    "text-align": "center",
+    "color": "#ffffff",
+    "line-height": "30px",
+    "font-size": "14px",
+    //"position": "absolute",
+    "cursor": "pointer",
+    "background-color": "rgb(61, 119, 193)",
+    "display":"inline-block"
+  },
+  "baseTabLi":{
+    "display":"inline-block","width":"100px","height":"30px","text-align":"center","line-height":"30px","cursor":"pointer","color":"#999999"
+  },
+
+  "rightContentDiv":{
+    "height":"486px",
+    "overflow":"hidden",
+    "width" : "99%"
+  },
+  "taskTable":{
+    "border":"0px","border-collapse":"collapse","margin":"0 auto","width":"99%"
+  },
+  "naviBottomDiv":{
+
+  },
+
+
+  "createNewTaskDiv":{
+    "width":"260px",
+    "height":"150px",
+    "cursor":"pointer",
+    "font-size":"28px",
+    "font-weight":"bold",
+    "line-height":"150px",
+    "margin-left":"100px",
+    "float":"left",
+    "color":"#ffffff",
+    "text-align":"center",
+    "background-color":"#3d77c1",
+    "box-shadow": "2px 2px 10px #2a5c95"
+  },
+  "createAddTaskDiv":{
+    "width":"260px",
+    "height":"150px",
+    "cursor":"pointer",
+    "font-size":"28px",
+    "font-weight":"bold",
+    "line-height":"150px",
+    "margin-left":"80px",
+    "float":"left",
+    "color":"#ffffff",
+    "text-align":"center",
+    "background-color":"#3d77c1",
+    "box-shadow": "2px 2px 10px #2a5c95"
+  },
+  "createExplainDiv":{
+    "color":"#bfc2c7",
+    "line-height":"20px",
+    "padding-left":"50px",
+    "padding-right":"50px",
+    "padding-top":"5px"
+  },
+
+
+  "formMarkNode": {
+    "width": "100%",
+    "height": "100%",
+    "opacity": 0.6,
+    "position": "absolute",
+    "background-color": "#CCC",
+    "top": "0px",
+    "left": "0px"
+  },
+  "formAreaNode": {
+    "position": "absolute",
+    "opacity": 0,
+    "top": "0px" //,
+    //"z-index" : "105"
+  },
+  "formNode": {
+    "background-color": "#FFF",
+    "box-shadow": "0px 0px 10px #999",
+    "margin": "auto",
+    "border": "1px solid #fff",
+    "overflow": "hidden"
+  },
+  "formTopNode": {
+    "color" : "#fff",
+    "height": "40px",
+    "background-color": "#3d77c1",
+    "border-top": "1px solid #ddd",
+    "border-bottom": "1px solid #b6b6b6",
+    "line-height": "40px",
+    "font-size": "14px",
+    "padding-left" : "5px",
+    "text-align": "left"
+  },
+  "formTopIconNode" : {
+    "width": "28px",
+    "height": "32px",
+    "float": "left",
+    "background": "url(/x_component_Execution/$WorkForm/default/icon/document.png) no-repeat center 4px"
+  },
+  "formTopTextNode" : {
+    "font-size": "16px",
+    "float": "left",
+    "width" : "70%",
+    "overflow" : "hidden",
+    "text-overflow" : "ellipsis",
+    "white-space":"nowrap"
+  },
+  "formTopCloseActionNode": {
+    "width": "32px",
+    "height": "32px",
+    "float": "right",
+    "padding-left" : "30px",
+    "padding-right" : "10px",
+    "background": "url(/x_component_Execution/$WorkForm/default/icon/close.png) no-repeat center 4px",
+    "cursor": "pointer"
+  },
+  "formTopContentNode" : {
+    "float" : "right",
+    "padding-right" : "10px",
+    "text-align" : "right"
+  },
+  "formTopContentTitle" : {
+  },
+  "formTopContentValue" : {
+    "padding-right" : "20px",
+    "font-size": "14px"
+  },
+  "formNewNode": {
+    "width": "47px",
+    "height": "47px",
+    "background": "url(/x_component_Template/$Explorer/default/icon/new.png) no-repeat"
+  },
+  "formIconNode": {
+    "width": "47px",
+    "height": "47px"
+  },
+  "formEditNode": {
+    "width": "47px",
+    "height": "47px"
+  },
+  "formContentNode": {
+    "border": "0px solid #666",
+    "width": "100%",
+    "margin": "auto",
+    "font-size": "14px",
+    "color": "#666",
+    "font-family": "微软雅黑",
+    "overflow" : "hidden"
+  },
+  "formTableContainer" : {
+    "margin": "0px 10px",
+    "overflow" : "hidden",
+    "positon" : "static"
+  },
+  "formBottomNode" : {
+    "height" : "50px",
+    "line-height" : "50px",
+    "border-top" : "1px solid #3d77c1",
+    "background-color" : "#fff",
+    "overflow" : "hidden"
+  },
+  "formOkActionNode": {
+    "margin-top" : "5px",
+    "height": "35px",
+    "width": "75px",
+    "cursor": "pointer",
+    "float": "right",
+    "line-height": "35px",
+    "text-align": "center",
+    "font-size": "16px",
+    "font-family": "微软雅黑",
+    "border": "1px solid #3d77c1",
+    "background-color" : "#3d77c1",
+    "color": "#FFF",
+    "margin-right": "20px",
+    "box-shadow": "3px 3px 3px #999"
+  },
+  "formCancelActionNode": {
+    "margin-top" : "5px",
+    "height": "35px",
+    "width": "75px",
+    "cursor": "pointer",
+    "float": "right",
+    "line-height": "35px",
+    "text-align": "center",
+    "font-size": "16px",
+    "font-family": "微软雅黑",
+    "border": "1px solid #3d77c1",
+    "background-color" : "#3d77c1",
+    "color": "#FFF",
+    "margin-right": "20px",
+    "box-shadow": "3px 3px 3px #999"
+  },
+
+  "":{},
+  "viewHeadNode": {
+    "width":"100%",
+    "height": "20px",
+    "background-color": "#fff",
+    "color": "#666666",
+    "line-height": "30px",
+    "font-family": "微软雅黑",
+    "font-size": "14px"
+  },
+
+  "normalThNode" : {
+    "background-color" : "#fff",
+    "text-align":"center",
+    "border-bottom": "1px solid #cfecf5",
+    "font-weight" : "normal"
+  },
+  "sortIconNode" : {
+    "height": "16px",
+    "width": "16px",
+    "line-height": "20px",
+    "margin-top": "5px",
+    //"float": "left",
+    "display":"inline-block",
+    "margin-right": "5px",
+    "background-position" : "center center",
+    "background-repeat" : "no-repeat",
+    "background-image" : "url(/x_component_Template/$Explorer/default/icon/dblsort.gif)"
+  },
+  "sortIconNode_asc" : {
+    "height": "16px",
+    "width": "16px",
+    "line-height": "20px",
+    "margin-top": "5px",
+    //"float": "left",
+    "display":"inline-block",
+    "margin-right": "5px",
+    "background-position" : "center center",
+    "background-repeat" : "no-repeat",
+    "background-image" : "url(/x_component_Template/$Explorer/default/icon/dblasc.gif)"
+  },
+  "sortIconNode_desc" : {
+    "height": "16px",
+    "width": "16px",
+    "line-height": "20px",
+    "margin-top": "5px",
+    //"float": "left",
+    "display":"inline-block",
+    "margin-right": "5px",
+    "background-position" : "center center",
+    "background-repeat" : "no-repeat",
+    "background-image" : "url(/x_component_Template/$Explorer/default/icon/dbldesc.gif)"
+  },
+
+
+  "documentNode":{
+    "height":"90px",
+    "max-height":"90px",
+    "min-height": "29px",
+    "overflow": "hidden",
+    "color": "#666666",
+    //"line-height": "39px",
+    "cursor": "pointer",
+    "font-family": "微软雅黑",
+    "font-size": "12px",
+    "background-color": "#fff"
+  },
+  "documentNodeCenter":{
+    "max-height":"90px",
+    "min-height": "29px",
+    "overflow": "hidden",
+    "color": "#666666",
+    //"line-height": "39px",
+    "cursor": "pointer",
+    "font-family": "微软雅黑",
+    "font-size": "12px",
+    "background-color": "#fff"
+  },
+  "documentNode_noread": {
+    "background-color": "#fcfcfc"
+  },
+  "documentNode_over": {
+    "background-color": "#f5f6f7"
+  },
+  "documentNode_remove": {
+    "background-color": "#ffcccc"
+  },
+
+  "documentActionNode": {
+    "height": "20px",
+    //"width": "20px",
+    //"line-height": "20px",
+    "color": "#0066cc",
+    "cursor": "pointer",
+    "margin-right": "5px",
+    "display":"block"
+  },
+  "documentActionNode_over":{
+    "color": "#003399"
+  },
+  "documentActionNode_down":{
+    "color": "#000"
+  },
+
+  "normalTdNode" : {
+    "min-height": "30px",
+    "padding-left" : "10px",
+    "text-align":"left",
+    "overflow" : "hidden",
+    //"font-weight" : "bold",
+    //"border-top": "1px solid #FFF",
+    "border-top": "1px dashed #cfecf5"
+  },
+  "normalTdCenterNode" : {
+    "min-height": "30px",
+    "padding-left" : "10px",
+    "text-align":"center",
+    "overflow" : "hidden",
+    //"font-weight" : "bold",
+    //"border-top": "1px solid #FFF",
+    "border-top": "1px dashed #cfecf5"
+  },
+  "appointNode":{
+    "background-image" :"url(/x_component_Execution/$Main/default/icon/appoint.png)",
+    "width":"35px",
+    "height":"35px",
+    "display":"block",
+    //    "left":"-10px",
+    //    "top":"-15px",
+    "margin-left":"-10px",
+    "margin-top":"-33px",
+//    "position":"absolute",
+    "display":"none"
+  },
+  "documentSubject" : {
+    "display":"table-cell",
+    "vertical-align":"middle",
+    "height":"65px",
+    "font-size" : "14px",
+    "font-weight" : "normal",
+    "color" : "#003399"
+  },
+  "documentSubjectCenter" : {
+    "display":"table-cell",
+    "vertical-align":"middle",
+    "height":"50px",
+    "font-size" : "14px",
+    "font-weight" : "normal",
+    "color" : "#003399"
+  },
+  "documentIcon":{
+    "height":"20px",
+    //"margin-top":"5px",
+    "display":"block"
+  },
+  "itemBlock" : {
+    "overflow" : "hidden",
+    "display" : "block"
+  },
+  "itemInLine" : {
+    "float" : "left",
+    "font-color" : "#888",
+    "padding-right" : "10px",
+    "padding-top" : "5px"
+  }
+
+}

x_desktop_web/x_component_Execution/$WorkStat/default/css.wcss

@@ -111,7 +111,7 @@
 
   //***********************统计按部门**************************************
   "deptToolbar":{
-    "width":"100%","min-width":"1000px","padding-top":"8px","margin-bottom":"10px","padding-left":"10px",
+    "width":"100%","min-width":"1000px","padding-top":"8px","padding-left":"10px",
     "border-bottom" : "1px dashed #dedede", "overflow" : "hidden"
   },
   "deptStatInfo":{
@@ -122,6 +122,7 @@
   "deptStatContent":{
     "overflow-x":"auto",
     "overflow-y":"auto",
+    "padding-top":"10px",
 //    "width":"100%",
     "height":"520px"
   },
@@ -233,7 +234,8 @@
     "color":"#ec6a1a"
   },
   "dateStatBaseTd":{
-    "border":"solid #000 1px"
+    "border":"solid #000 1px",
+    "min-width":"100px"
   },
 
   //***********************统计按日期**************************************

x_desktop_web/x_component_Execution/Attachment.js

@@ -90,8 +90,8 @@ MWF.xApplication.Execution.Attachment = new Class({
                         formData.append('site', this.options.documentId);
                         this.actions.uploadAttachment(this.options.documentId, function (o, text) {
                             j = JSON.decode(text);
-                            if (j.userMessage) {
-                                this.actions.getAttachment(j.userMessage, this.options.documentId, function (json) {
+                            if (j.data && j.data.id) {
+                                this.actions.getAttachment(j.data.id, this.options.documentId, function (json) {
                                     json = this.transportData(json);
                                     if (json.data) {
                                         this.attachmentController.addAttachment(json.data);

x_desktop_web/x_component_Execution/Chat.js

@@ -265,8 +265,8 @@ MWF.xApplication.Execution.Chat = new Class({
                 var errorText = error;
                 if (xhr) errorMessage = xhr.responseText;
                 var e = JSON.parse(errorMessage);
-                if(e.userMessage){
-                    this.app.notice( e.userMessage,"error");
+                if(e.message){
+                    this.app.notice( e.message,"error");
                 }else{
                     this.app.notice( errorText,"error");
                 }

x_desktop_web/x_component_Execution/ReportAttachment.js

@@ -91,8 +91,8 @@ MWF.xApplication.Execution.ReportAttachment = new Class({
                         formData.append('site', this.options.documentId);
                         this.actions.uploadReportAttachment(this.options.documentId, function (o, text) {
                             j = JSON.decode(text);
-                            if (j.userMessage) {
-                                this.actions.getAttachment(j.userMessage, this.options.documentId, function (json) {
+                            if (j.data && j.data.id) {
+                                this.actions.getAttachment(j.data.id, this.options.documentId, function (json) {
                                     json = this.transportData(json);
                                     if (json.data) {
                                         this.attachmentController.addAttachment(json.data);
@@ -101,10 +101,19 @@ MWF.xApplication.Execution.ReportAttachment = new Class({
                                     this.attachmentController.checkActions();
 
                                     this.fireEvent("upload", [json.data]);
+                                }.bind(this),function(xhr,text,error){
+                                    var errorText = error;
+                                    if (xhr) errorMessage = xhr.responseText;
+                                    var e = JSON.parse(errorMessage);
+                                    if(e.message){
+                                        this.app.notice( e.message,"error");
+                                    }else{
+                                        this.app.notice( errorText,"error");
+                                    }
                                 }.bind(this))
                             }
                             this.attachmentController.checkActions();
-                        }.bind(this), function(){alert("err")}.bind(this), formData, file);
+                        }.bind(this), function(){}.bind(this), formData, file);
                     }
                 }
             }else{

x_desktop_web/x_component_Execution/StatForm.js

@@ -521,8 +521,8 @@ MWF.xApplication.Execution.StatForm = new Class({
         var errorText = error;
         if (xhr) errorMessage = xhr.responseText;
         var e = JSON.parse(errorMessage);
-        if (e.userMessage) {
-            this.app.notice(e.userMessage, "error");
+        if (e.message) {
+            this.app.notice(e.message, "error");
         } else {
             this.app.notice(errorText, "error");
         }

x_desktop_web/x_component_Execution/WorkDeploy.js

@@ -59,7 +59,7 @@ MWF.xApplication.Execution.WorkDeploy = new Class({
         }
 
         this.actions.getCenterWorkInfo(id,function(json){
-            if(json.type = "SUCCESS"){
+            if(json.type = "success"){
                 this.centerWorkData = json.data;
                 this.centerWorkId = this.centerWorkData.id
             }
@@ -377,9 +377,9 @@ MWF.xApplication.Execution.WorkDeploy = new Class({
         if(this.options.isNew || this.options.isEdited){
             this.saveCenterWork(r,function(json){
                 if(json.type && json.type == "error"){
-                    this.app.notice(json.userMessage, "error")
+                    this.app.notice(json.message, "error")
                 }else{
-                    if(json.userMessage)this.reloadTableContent(json.userMessage)
+                    if(json.data && json.data.id)this.reloadTableContent(json.data.id)
                     if(this.centerWorkData)this.openWorkForm(this.centerWorkData)
                 }
             }.bind(this))
@@ -396,11 +396,11 @@ MWF.xApplication.Execution.WorkDeploy = new Class({
         if(this.options.isNew || this.options.isEdited){
             this.saveCenterWork(r,function(json){
                 if(json.type && json.type == "error"){
-                    this.app.notice(json.userMessage, "error")
+                    this.app.notice(json.message, "error")
                 }else{
-                    if(json.userMessage){
-                        centerId = json.userMessage;
-                        this.reloadTableContent(json.userMessage)
+                    if(json.data && json.data.id){
+                        centerId = json.data.id;
+                        this.reloadTableContent(json.data.id)
                     }
 
                 }
@@ -451,7 +451,7 @@ MWF.xApplication.Execution.WorkDeploy = new Class({
         _self.app.confirm("warn",e,_self.lp.submitWarn.warnTitle,_self.lp.submitWarn.warnContent,300,120,function(){
             _self.actions.deleteCenterWork(_self.centerWorkData.id, function(json){
                 if(json.type && json.type=="success"){
-                    _self.app.notice(json.userMessage, "success");
+                    _self.app.notice(this.lp.prompt.deleteCenterWork, "success");
                     _self.closeWork({"action":"reload"});
                 }
             }.bind(_self),function(xhr,text,error){
@@ -470,7 +470,7 @@ MWF.xApplication.Execution.WorkDeploy = new Class({
         _self.app.confirm("warn",e,_self.lp.submitWarn.warnTitle,_self.lp.submitWarn.warnDeployContent,300,120,function(){
             _self.actions.deployCenterWork(_self.centerWorkData.id, function(json){
                 if(json.type && json.type=="success"){
-                    _self.app.notice(json.userMessage, "success");
+                    _self.app.notice(this.lp.prompt.deployCenterWrk, "success");
                     _self.close();
                     _self.fireEvent("reloadView", {"action":"reload"});
                 }
@@ -489,7 +489,7 @@ MWF.xApplication.Execution.WorkDeploy = new Class({
         _self.app.confirm("warn",e,_self.lp.submitWarn.warnTitle,_self.lp.submitWarn.warnConfirmContent,300,120,function(){
             _self.actions.deployCenterWork(_self.centerWorkData.id, function(json){
                 if(json.type && json.type=="success"){
-                    _self.app.notice(json.userMessage, "success");
+                    _self.app.notice(this.lp.prompt.comfirmCenterWork, "success");
                     _self.close();
                     _self.fireEvent("reloadView", {"action":"reload"});
                 }
@@ -508,7 +508,7 @@ MWF.xApplication.Execution.WorkDeploy = new Class({
         _self.app.confirm("warn",e,_self.lp.submitWarn.warnTitle,_self.lp.submitWarn.warnArchiveContent,300,120,function(){
             _self.actions.archiveMainTask(_self.centerWorkData.id, function(json){
                 if(json.type && json.type=="success"){
-                    _self.app.notice(json.userMessage, "success");
+                    _self.app.notice(this.lp.prompt.archiveCenterWork, "success");
                     _self.close();
                     _self.fireEvent("reloadView", {"action":"reload"});
                 }
@@ -577,8 +577,8 @@ MWF.xApplication.Execution.WorkDeploy = new Class({
         if (xhr) errorMessage = xhr.responseText;
         if(errorMessage!=""){
             var e = JSON.parse(errorMessage);
-            if(e.userMessage){
-                this.app.notice( e.userMessage,"error");
+            if(e.message){
+                this.app.notice( e.message,"error");
             }else{
                 this.app.notice( errorText,"error");
             }
@@ -778,7 +778,7 @@ MWF.xApplication.Execution.WorkDeploy.MyDeployWorkDocument = new Class({
         _self.view.app.confirm("warn",e,_self.view.app.lp.WorkDeploy.submitWarn.warnTitle,_self.view.app.lp.WorkDeploy.submitWarn.warnContent,300,120,function(){
             _self.actions.deleteBaseWork(id, function(json){
                 if(json.type && json.type=="success"){
-                    this.app.notice(json.userMessage, "success");
+                    this.app.notice(_self.view.explorer.lp.prompt.deleteBaseWork, "success");
                     _self.view.explorer.reloadTableContent()
                 }
             }.bind(_self),function(xhr,text,error){
@@ -923,7 +923,7 @@ MWF.xApplication.Execution.WorkDeploy.MyWorkDocument = new Class({
         _self.app.confirm("warn",e,_self.lp.submitWarn.warnTitle,_self.lp.submitWarn.warnTackBackContent,300,120,function(){
             _self.actions.unAppointBaseWork({workId:_self.data.id}, function(json){
                 if(json.type && json.type=="success"){
-                    _self.app.notice(json.userMessage, "success");
+                    _self.app.notice(_self.explorer.lp.prompt.tackbackBaseWork, "success");
                     _self.explorer.reloadTableContent();
                 }
             }.bind(_self),function(xhr,text,error){
@@ -1098,14 +1098,15 @@ MWF.xApplication.Execution.WorkDeploy.Appoint = new Class({
             authorizeOpinion : this.appointOpinion.get("value")
         }
         this.actions.appointBaseWork(submitData,function(json){
+            this.app.notice(this.app.lp.WorkDeploy.prompt.authorizeBaseWork,"success")
             this.close();
             this.fireEvent("reloadView");
         }.bind(this),function(xhr,text,error){
             var errorText = error;
             if (xhr) errorMessage = xhr.responseText;
             var e = JSON.parse(errorMessage);
-            if(e.userMessage){
-                this.app.notice( e.userMessage,"error");
+            if(e.message){
+                this.app.notice( e.message,"error");
             }else{
                 this.app.notice( errorText,"error");
             }

x_desktop_web/x_component_Execution/WorkDetail.js

@@ -34,7 +34,6 @@ MWF.xApplication.Execution.WorkDetail = new Class({
 
         this.data = data || {};
         this.workDetailLp = this.app.lp.WorkDetail;
-
         this.actions.getBaseWorkInfo(this.data.id,function(json){
                 if(json.data){
                     this.baseWorkData = json.data
@@ -696,8 +695,8 @@ MWF.xApplication.Execution.WorkDetail = new Class({
         if (xhr) errorMessage = xhr.responseText;
         if(errorMessage!=""){
             var e = JSON.parse(errorMessage);
-            if(e.userMessage){
-                this.app.notice( e.userMessage,"error");
+            if(e.message){
+                this.app.notice( e.message,"error");
             }else{
                 this.app.notice( errorText,"error");
             }

x_desktop_web/x_component_Execution/WorkForm.js

@@ -59,6 +59,7 @@ MWF.xApplication.Execution.WorkForm = new Class({
             }else if(this.options.id){
                 this.id = this.options.id
             }
+
             this.actions.getBaseWorkInfo(this.id,function(json){
                     if(json.data){
                         this.data = json.data
@@ -277,19 +278,21 @@ MWF.xApplication.Execution.WorkForm = new Class({
                     if(this.options.isNew){
                         data.centerId = this.options.centerWorkId || this.data.centerWorkId || this.data.centerId ;
                     }
-
                     this.app.restActions.saveTask(data, function(json){
                         if(json.type && json.type == "success"){
-                            if(json.userMessage) {
-                                this.attachment.options.documentId = json.userMessage;
-                                this.data.id = json.userMessage;
+                            if(json.data.id) {
+                                this.attachment.options.documentId = json.data.id;
+                                this.data.id = json.data.id;
                                 //this.options.isNew = false;
                             }
                         }
-                    }.bind(this),null,false)
+                    }.bind(this), function(xhr,text,error){
+                        this.showErrorMessage(xhr,text,error)
+                    }.bind(this),false)
                 }
             }.bind(this)
         })
+
         this.attachment.load();
     },
     _createBottomContent: function () {
@@ -334,9 +337,9 @@ MWF.xApplication.Execution.WorkForm = new Class({
             data.centerId = this.data.centerId;
             this.app.restActions.saveTask(data,function(json){
                 if(json.type && json.type == "success"){
-                    if(json.userMessage){
+                    if(json.data.id){
                         var ids = [];
-                        ids.push(json.userMessage);
+                        ids.push(json.data.id);
                         var workData = {  "workIds":ids };
 
                         this.actions.deployBaseWork( workData, function( json ){
@@ -351,8 +354,8 @@ MWF.xApplication.Execution.WorkForm = new Class({
                             var errorText = error;
                             if (xhr) errorMessage = xhr.responseText;
                             var e = JSON.parse(errorMessage);
-                            if(e.userMessage){
-                                this.app.notice( e.userMessage,"error");
+                            if(e.message){
+                                this.app.notice( e.message,"error");
                             }else{
                                 this.app.notice( errorText,"error");
                             }
@@ -393,8 +396,8 @@ MWF.xApplication.Execution.WorkForm = new Class({
             var errorText = error;
             if (xhr) errorMessage = xhr.responseText;
             var e = JSON.parse(errorMessage);
-            if(e.userMessage){
-                this.app.notice( e.userMessage,"error");
+            if(e.message){
+                this.app.notice( e.message,"error");
             }else{
                 this.app.notice( errorText,"error");
             }
@@ -418,8 +421,8 @@ MWF.xApplication.Execution.WorkForm = new Class({
         if (xhr) errorMessage = xhr.responseText;
         if(errorMessage!=""){
             var e = JSON.parse(errorMessage);
-            if(e.userMessage){
-                this.app.notice( e.userMessage,"error");
+            if(e.message){
+                this.app.notice( e.message,"error");
             }else{
                 this.app.notice( errorText,"error");
             }

x_desktop_web/x_component_Execution/WorkGather-bak.js

@@ -0,0 +1,415 @@
+MWF.xApplication.Execution = MWF.xApplication.Execution || {};
+
+MWF.xDesktop.requireApp("Template", "Explorer", null, false);
+MWF.xDesktop.requireApp("Template", "MForm", null, false);
+MWF.xDesktop.requireApp("Execution", "WorkForm", null, false);
+
+MWF.xApplication.Execution.WorkGather = new Class({
+    Extends: MWF.xApplication.Template.Explorer.PopupForm,
+    Implements: [Options, Events],
+    options: {
+        //"centerWorkId" : "fc44be47-7271-469f-8f04-deebdb71d3e6",
+        "style": "default",
+        "width": "100%",
+        "height": "100%",
+        "hasTop": true,
+        "hasIcon": false,
+        "hasBottom": true,
+        "title": "",
+        "draggable": false,
+        "closeAction": true,
+        "isNew": false,
+        "isEdited": true
+    },
+    initialize: function (explorer, actions, data, options) {
+        this.setOptions(options);
+        this.explorer = explorer;
+        this.app = explorer.app;
+        this.lp = this.app.lp.workGather;
+        this.actions = this.app.restActions;
+        this.path = "/x_component_Execution/$WorkGather/";
+        this.cssPath = this.path + this.options.style + "/css.wcss";
+        this._loadCss();
+
+        this.data = data || {};
+
+        this.actions = actions;
+
+
+    },
+    load: function () {
+        //alert(JSON.stringify(this.data))
+        if (this.options.isNew) {
+            this.create();
+        } else if (this.options.isEdited) {
+            this.edit();
+        } else {
+            this.open();
+        }
+    },
+    createTopNode: function () {
+        if (!this.formTopNode) {
+            this.formTopNode = new Element("div.formTopNode", {
+                "styles": this.css.formTopNode
+            }).inject(this.formNode);
+
+            this.formTopIconNode = new Element("div", {
+                "styles": this.css.formTopIconNode
+            }).inject(this.formTopNode)
+
+            this.formTopTextNode = new Element("div", {
+                "styles": this.css.formTopTextNode,
+                "text": this.data.title
+            }).inject(this.formTopNode)
+
+            if (this.options.closeAction) {
+                this.formTopCloseActionNode = new Element("div.formTopCloseActionNode", {"styles": this.css.formTopCloseActionNode}).inject(this.formTopNode);
+                this.formTopCloseActionNode.addEvent("click", function () {
+                    this.close()
+                }.bind(this))
+            }
+
+            this.formTopContentNode = new Element("div", {
+                "styles": this.css.formTopContentNode
+            }).inject(this.formTopNode)
+
+            this._createTopContent();
+
+        }
+    },
+    _createTopContent: function () {
+
+    },
+
+    _createTableContent: function (data) {
+        this.titleDiv = new Element("div.titleDiv",{
+            "styles":this.css.titleDiv,
+            "text":this.data.title
+        }).inject(this.formTableArea)
+
+        this.inforDiv = new Element("div.inforDiv",{"styles":this.css.inforDiv}).inject(this.formTableArea);
+        this.gatherDiv = new Element("div.gatherDiv",{"styles":this.css.gatherDiv}).inject(this.formTableArea);
+
+        this.getDepartmentGather();
+    },
+    getDepartmentGather: function(){
+        this.reportDataArr = [];
+        this.gatherDiv.empty();
+        this.WorkReportView = new MWF.xApplication.Execution.WorkGather.WorkReportView(this.gatherDiv, this.app, this, { templateUrl : this.path+"listItem.json" })
+        this.WorkReportView.load();
+    },
+
+    openWorkReport: function(workReportId,workId){
+        MWF.xDesktop.requireApp("Execution", "WorkReport", function(){
+
+            var data = {
+                workReportId : workReportId,
+                workId : workId
+            }
+
+            this.workReport = new MWF.xApplication.Execution.WorkReport(this, this.actions,data,{
+                "isEdited":false,
+                "width":"90%",
+                "height":"90%",
+                onReloadView : function( data ){
+                    this.getDepartmentGather();
+                }.bind(this)
+            } );
+            this.workReport.load();
+        }.bind(this));
+    },
+    _createBottomContent: function () {
+
+        this.submitActionNode = new Element("div.submitActionNode", {
+            "styles": this.css.formActionNode,
+            "text": this.lp.bottomAction.submit
+        }).inject(this.formBottomNode);
+        var _self = this;
+        this.submitActionNode.addEvent("click", function (e) {
+                this.app.confirm("warn",e,this.lp.submitWarn.warnTitle,this.lp.submitWarn.warnContent,300,120,function(){
+                    _self.submitGather()
+                    this.close();
+                },function(){
+                    this.close();
+                })
+
+        }.bind(this));
+
+        this.closeActionNode = new Element("div.formActionNode", {
+            "styles": this.css.formActionNode,
+            "text": this.lp.bottomAction.close
+        }).inject(this.formBottomNode);
+        this.closeActionNode.addEvent("click", function (e) {
+            this.close(e);
+        }.bind(this));
+
+    },
+    submit:function(workReportData){
+        var adminText = this.gatherDiv.getElementById("admin"+workReportData.id);
+        var adminValue = "";
+        if(adminText) adminValue = adminText.get("value");
+        var opinionValue = ""
+        var opinionText = this.gatherDiv.getElementById("opinion"+workReportData.id);
+        if(opinionText) opinionValue = opinionText.get("value");
+        var submitData = {
+            workId : workReportData.workId,
+            id : workReportData.id,
+            adminSuperviseInfo : adminValue,
+            opinion :  opinionValue
+        }
+        this.actions.submitWorkReport( submitData, function(json){
+            if(json.type == "success"){
+                this.app.notice(json.userMessage,"success");
+                this.actions.getDepartmentGather(this.data.gatherId,function(json){
+                    if(json.data.reportInfos && json.data.reportInfos.length==0){
+                        this.fireEvent("reloadView");
+                        this.close()
+                    }else{
+                        this.getDepartmentGather();
+                    }
+                }.bind(this),null,false)
+
+            }
+        }.bind(this),function(xhr,text,error){
+            var errorText = error;
+            if (xhr) errorMessage = xhr.responseText;
+            var e = JSON.parse(errorMessage);
+            if(e.userMessage){
+                this.app.notice( e.userMessage,"error");
+            }else{
+                this.app.notice( errorText,"error");
+            }
+        }.bind(this));
+
+    },
+    submitGather:function(){
+        this.submitStatus = true;
+        this.submitError = "";
+        for(var i=0;i<this.reportDataArr.length;i++){
+            this.currentReportData = this.reportDataArr[i]
+            if(this.submitStatus){
+                var adminText = this.gatherDiv.getElementById("admin"+this.currentReportData.id);
+                var adminValue = "";
+                if(adminText) adminValue = adminText.get("value");
+                var opinionValue = ""
+                var opinionText = this.gatherDiv.getElementById("opinion"+this.currentReportData.id);
+                if(opinionText) opinionValue = opinionText.get("value");
+                var submitData = {
+                    workId : this.currentReportData.workId,
+                    id : this.currentReportData.id,
+                    adminSuperviseInfo : adminValue,
+                    opinion :  opinionValue
+                }
+                //if(i==0){
+                //    submitData.workId = "fefwfwfwfewfwfewfe";
+                //    submitData.id = "eeeeeeeeee"
+                //
+                //}
+                this.actions.submitWorkReport( submitData, function(json){
+
+                }.bind(this), function(xhr){
+                    var json = JSON.parse(xhr.responseText);
+                    this.submitError = "《"+this.currentReportData.title+"》"+json.userMessage
+                    this.submitStatus = false;
+                }.bind(this),false);
+            }
+        }
+
+        if(!this.submitStatus){
+            this.app.notice(this.submitError, "error");
+            this.getDepartmentGather();
+        }else{
+            this.app.notice(this.lp.submitWarn.submitSuccess, "success");
+            this.fireEvent("reloadView");
+            this.close();
+        }
+    }
+
+})
+
+
+
+
+MWF.xApplication.Execution.WorkGather.WorkReportView = new Class({
+    Extends: MWF.xApplication.Template.Explorer.ComplexView,
+    _createDocument: function(data){
+        return new MWF.xApplication.Execution.WorkGather.WorkReportDocument(this.viewNode, data, this.explorer, this);
+    },
+
+    _getCurrentPageData: function(callback, count){
+        this.actions.getDepartmentGather(this.explorer.data.gatherId,function(json){ //alert(JSON.stringify(json))
+            if(callback) callback(json)
+        }.bind(this),null,false)
+
+
+    },
+    loadElementList: function (count) {
+        if (!this.isItemsLoaded) {
+            if (!this.isItemLoadding) {
+                this.isItemLoadding = true;
+                this._getCurrentPageData(function (json) {
+                    //if( !json.data )return;
+                    var length = json.count;  //|| json.data.length;
+
+                    //if (!this.isCountShow){
+                    //    this.filterAllProcessNode.getFirst("span").set("text", "("+this.count+")");
+                    //    this.isCountShow = true;
+                    //}
+                    if (length <= this.items.length) {
+                        this.isItemsLoaded = true;
+                    }
+                    json.data.reportInfos.each(function (data) {
+                        if (!this.documents[data.id]) {
+                            var item = this._createDocument(data);
+                            this.items.push(item);
+                            this.documents[data.id] = item;
+                        }
+                    }.bind(this));
+
+                    this.isItemLoadding = false;
+
+                    if (this.loadItemQueue > 0) {
+                        this.loadItemQueue--;
+                        this.loadElementList();
+                    }
+                }.bind(this), count);
+            } else {
+                this.loadItemQueue++;
+            }
+        }
+    },
+    _removeDocument: function(documentData, all){
+
+    },
+    _create: function(data){
+
+    },
+    _openDocument: function( documentData ){
+        //this.workForm = new MWF.xApplication.Execution.WorkForm(this, this.actions, documentData, {
+        //    "isNew": false,
+        //    "isEdited": false
+        //})
+        //this.workForm.load();
+    },
+    _queryCreateViewNode: function(){
+
+    },
+    _postCreateViewNode: function( viewNode ){
+
+    },
+    _queryCreateViewHead:function(){
+
+    },
+    _postCreateViewHead: function( headNode ){
+
+    }
+
+})
+
+MWF.xApplication.Execution.WorkGather.WorkReportDocument = new Class({
+    Extends: MWF.xApplication.Template.Explorer.ComplexDocument,
+
+    _queryCreateDocumentNode:function( itemData ){
+
+    },
+    _postCreateDocumentNode: function( itemNode, itemData ){
+        //alert(JSON.stringify(itemData))
+        //alert(itemNode.get("html"))
+        if( itemData.reports ){
+            itemData.reports.each(function(d){
+                this.view.explorer.reportDataArr.push(d);
+                var trNode = new Element("tr.trNodeTitle",{"styles":this.view.css.trNodeTitle}).inject(this.view.viewNode);
+                var tdNode = new Element("td.tdNodeTitle",{
+                    "styles":this.view.css.tdNodeTitle,
+                    "text": d.title,
+                    "colspan":"6"
+                }).inject(trNode).
+                    addEvents({
+                        "click":function(){
+                            this.view.explorer.openWorkReport(d.id, d.workId);
+                        }.bind(this)
+                    })
+
+                trNode = new Element("tr.trNode",{"styles":this.view.css.trNode}).inject(this.view.viewNode)
+                tdNode = new Element("td.tdNodeContent",{
+                    "styles":this.view.css.tdNodeContent
+                }).inject(trNode);
+                divNode = new Element("div.divNode",{
+                    "styles":this.view.css.divNode,
+                    "text": d.workInfo.shortProgressAction?d.workInfo.shortProgressAction:"",
+                    "title": d.workInfo.shortProgressAction?d.workInfo.shortProgressAction:""
+                }).inject(tdNode);
+                tdNode = new Element("td.tdNodeContent",{
+                    "styles":this.view.css.tdNodeContent
+                }).inject(trNode);
+                divNode = new Element("div.divNode",{
+                    "styles":this.view.css.divNode,
+                    "text": d.progressDescription,
+                    "title": d.progressDescription
+                }).inject(tdNode);
+                tdNode = new Element("td.tdNodeContent",{
+                    "styles":this.view.css.tdNodeContent
+                }).inject(trNode);
+                divNode = new Element("div.divNode",{
+                    "styles":this.view.css.divNode,
+                    "text": d.workPlan,
+                    "title": d.workPlan
+                }).inject(tdNode);
+                //管理员
+                if(d.isWorkAdmin && d.processStatus == this.view.lp.activityName.manager){
+                    tdNode = new Element("td.tdNodeContent",{
+                        "styles":this.view.css.tdNodeContent
+                    }).inject(trNode);
+                    var teextareaNode = new Element("textarea.tetareaNode",{
+                        "styles":this.view.css.textareaNode,
+                        "id":"admin"+ d.id
+                    }).inject(tdNode);
+                }else{
+                    tdNode = new Element("td.tdNodeContent",{
+                        "styles":this.view.css.tdNodeContent
+                    }).inject(trNode);
+                    divNode = new Element("div.divNode", {
+                        "styles": this.view.css.divNode,
+                        "text": d.adminSuperviseInfo,
+                        "title": d.adminSuperviseInfo
+                    }).inject(tdNode)
+                }
+                //领导
+                //this.workReportData.processStatus == this.lp.activityName.leader && this.workReportData.isReadLeader && this.processIdentity.indexOf(this.app.identity)>-1
+                if(d.processStatus == this.view.lp.activityName.leader && d.isReadLeader && d.currentProcessorIdentity.indexOf(this.app.identity)>-1){
+                    tdNode = new Element("td.tdNodeContent",{
+                        "styles":this.view.css.tdNodeContent
+                    }).inject(trNode);
+                    var teextareaNode = new Element("textarea.tetareaNode",{
+                        "styles":this.view.css.textareaNode,
+                        "id":"opinion"+ d.id
+                    }).inject(tdNode);
+                }else{
+                    tdNode = new Element("td.tdNodeContent",{
+                        "styles":this.view.css.tdNodeContent,
+                        "text": ""
+                    }).inject(trNode);
+                }
+
+                var tdNodeAction = new Element("td.tdNodeAction",{
+                    "styles":this.view.css.tdNodeAction,
+                }).inject(trNode);
+                var actionTxt = new Element("a.actionTxt",{
+                    "styles":this.view.css.actionTxt,
+                    "text":this.view.lp.viewSubmit
+                }).inject(tdNodeAction)
+                    .addEvents({
+                        "click":function(){
+                            this.view.explorer.submit(d)
+                        }.bind(this)
+                    })
+
+
+            }.bind(this))
+
+            //this.view.viewNode.getElements("textarea").setStyle("height","100%")
+        }
+
+    }
+
+})

x_desktop_web/x_component_Execution/WorkGather.js

@@ -256,7 +256,7 @@ MWF.xApplication.Execution.WorkGather = new Class({
         }
         this.actions.submitWorkReport( submitData, function(json){
             if(json.type == "success"){
-                this.app.notice(json.userMessage,"success");
+                this.app.notice(this.lp.prompt.submitWorkReport,"success");
                 this.actions.getDepartmentGather(this.data.gatherId,function(json){
                     if(json.data && json.data.length==0){
                         this.fireEvent("reloadView");
@@ -275,8 +275,8 @@ MWF.xApplication.Execution.WorkGather = new Class({
             var errorText = error;
             if (xhr) errorMessage = xhr.responseText;
             var e = JSON.parse(errorMessage);
-            if(e.userMessage){
-                this.app.notice( e.userMessage,"error");
+            if(e.message){
+                this.app.notice( e.message,"error");
             }else{
                 this.app.notice( errorText,"error");
             }
@@ -321,7 +321,7 @@ MWF.xApplication.Execution.WorkGather = new Class({
 
                     }.bind(this), function(xhr){
                         var json = JSON.parse(xhr.responseText);
-                        this.submitError = "《"+this.currentReportData.title+"》"+json.userMessage
+                        this.submitError = "《"+this.currentReportData.title+"》"+json.message
                         this.submitStatus = false;
                     }.bind(this),false);
                 }

x_desktop_web/x_component_Execution/WorkList.js

@@ -513,6 +513,21 @@ MWF.xApplication.Execution.WorkList = new Class({
         }else if(this.workNavi1 == "center"){
             this.loadCenterWorkList(this.workNavi2,filterData)
         }
+    },
+    showErrorMessage:function(xhr,text,error){
+        var errorText = error;
+        if (xhr) errorMessage = xhr.responseText;
+        if(errorMessage!=""){
+            var e = JSON.parse(errorMessage);
+            if(e.message){
+                this.app.notice( e.message,"error");
+            }else{
+                this.app.notice( errorText,"error");
+            }
+        }else{
+            this.app.notice(errorText,"error")
+        }
+
     }
 
 })
@@ -551,27 +566,13 @@ MWF.xApplication.Execution.WorkList.WorkForm = new Class({
             "styles":this.css.createExplainDiv,
             "html":html
         }).inject(this.formBottomNode);
-    },
+    }
 
 
 
 
 
-    showErrorMessage:function(xhr,text,error){
-        var errorText = error;
-        if (xhr) errorMessage = xhr.responseText;
-        if(errorMessage!=""){
-            var e = JSON.parse(errorMessage);
-            if(e.userMessage){
-                this.app.notice( e.userMessage,"error");
-            }else{
-                this.app.notice( errorText,"error");
-            }
-        }else{
-            this.app.notice(errorText,"error")
-        }
 
-    }
 
 })
 
@@ -715,11 +716,11 @@ MWF.xApplication.Execution.WorkList.CenterWorkDocument = new Class({
         _self.view.app.confirm("warn",e,_self.view.app.lp.workList.submitWarn.warnTitle,_self.view.app.lp.workList.submitWarn.warnContent.delete,300,120,function(){
             _self.actions.deleteCenterWork(_self.data.id, function(json){
                 if(json.type && json.type=="success"){
-                    this.app.notice(json.userMessage, "success");
+                    this.app.notice(_self.view.app.lp.workList.prompt.deleteCenterWork, "success");
                     _self.app.workList.loadCenterWorkList(this.app.workList.workNavi2)
                 }
             }.bind(_self),function(xhr,text,error){
-                _self.app.workList.showErrorMessage(xhr,text,error)
+                _self.explorer.explorer.showErrorMessage(xhr,text,error)
             }.bind(_self));
 
             this.close()
@@ -841,8 +842,8 @@ MWF.xApplication.Execution.WorkList.BaseWorkView = new Class({
             var errorText = error;
             if (xhr) errorMessage = xhr.responseText;
             var e = JSON.parse(errorMessage);
-            if(e.userMessage){
-                this.app.notice( e.userMessage,"error");
+            if(e.message){
+                this.app.notice( e.message,"error");
             }else{
                 this.app.notice( errorText,"error");
             }
@@ -1024,13 +1025,13 @@ MWF.xApplication.Execution.WorkList.BaseWorkDocument = new Class({
             };
 
             _self.actions.unAppointBaseWork(data,function(json){
-                this.app.notice(json.userMessage,"success");
+                this.app.notice(_self.view.app.lp.workList.prompt.tackbackBaseWork,"success");
             }.bind(_self),function(xhr,text,error){
                 var errorText = error;
                 if (xhr) errorMessage = xhr.responseText;
                 var e = JSON.parse(errorMessage);
-                if(e.userMessage){
-                    this.app.notice( e.userMessage,"error");
+                if(e.message){
+                    this.app.notice( e.message,"error");
                 }else{
                     this.app.notice( errorText,"error");
                 }
@@ -1062,7 +1063,7 @@ MWF.xApplication.Execution.WorkList.BaseWorkDocument = new Class({
         _self.view.app.confirm("warn",e,_self.view.app.lp.workList.submitWarn.warnTitle,_self.view.app.lp.workList.submitWarn.warnContent.delete,300,120,function(){
             _self.actions.deleteBaseWork(_self.data.id, function(json){
                 if(json.type && json.type=="success"){
-                    this.app.notice(json.userMessage, "success");
+                    this.app.notice(_self.view.app.lp.workList.prompt.deleteBaseWork, "success");
                     _self.app.workList.clickBaseWorkTaskNavi(_self.app.workList.workNavi2)
                 }
             }.bind(_self),function(xhr,text,error){
@@ -1263,8 +1264,8 @@ MWF.xApplication.Execution.WorkList.Appoint = new Class({
             var errorText = error;
             if (xhr) errorMessage = xhr.responseText;
             var e = JSON.parse(errorMessage);
-            if(e.userMessage){
-                this.app.notice( e.userMessage,"error");
+            if(e.message){
+                this.app.notice( e.message,"error");
             }else{
                 this.app.notice( errorText,"error");
             }