Merge remote-tracking branch 'origin/master'

src/main/java/cn/com/tenlion/systemoa/service/archivesaccept/impl/ArchivesAcceptServiceImpl.java

@@ -7,7 +7,6 @@ import ink.wgink.module.activiti.pojo.dtos.oa.OaOnFileDTO;
 import ink.wgink.module.activiti.service.oa.IOaOnFileService;
 import ink.wgink.module.menu.pojo.vos.MenuVO;
 import ink.wgink.pojo.ListPage;
-import ink.wgink.pojo.bos.menu.SaveMenuBO;
 import ink.wgink.pojo.result.SuccessResult;
 import ink.wgink.pojo.result.SuccessResultList;
 import ink.wgink.util.map.HashMapUtil;

src/main/resources/static/assets/js/vendor/comment/css/comment.css

@@ -0,0 +1,185 @@
+/*初始化样式*/
+body,h1,h2,h3,h4,h5,ul,li,a,div,p,span,table,tr,td,img{margin: 0;padding: 0;}
+ul{padding: 0;margin: 0;}
+li{list-style: none;}
+a{text-decoration: none;}
+img{outline: none;border: 0;}
+body{font-family: "Microsoft Yahei";}
+/*清除浮动*/
+.clearfix:before,
+.clearfix:after{content: " ";display: table;}
+.clearfix:after{clear: both;}
+.clearfix{zoom: 1;}
+/*浮动*/
+.pull-right{float: right !important;}
+.pull-left{float: left !important;}
+/*----------------------------------------------------------------------------------------------------------*/
+.content{float: left;}
+.flex-text-wrap,pre{margin: 0 !important;}
+.commentAll{width: 500px;padding: 20px;border: 1px solid #ededed;margin: 20px auto;}
+.plBtn{width: 75px;height: 36px;line-height: 36px;background-color: #339b53;text-align: center;display: block;float: right;color: #FFFFFF;font-size: 12px;border-radius: 6px;margin-right: 2px;margin-top: 20px;}
+.plBtn:hover{background-color: #2f904d;}
+
+/*----------评论区域 begin----------*/
+.comment-show{margin-top: 20px;}
+.comment-show-con {
+    width: 100%;
+    border-top: 1px solid #EDEDED;
+    padding: 10px 0;
+}
+.comment-show-con-img {
+    width: 48px;
+    height: 48px;
+    overflow: hidden;
+    margin-top: 5px;
+}
+.comment-show-con-list {
+    width: 85%;
+    margin-left: 3%;
+}
+.pl-text {
+    width: 100%;
+    margin-top: 7px;
+    word-wrap: break-word;
+    overflow: hidden;
+}
+.date-dz {
+    width: 100%;
+    float: left;
+}
+.hf-list-con {
+    float: left;
+    width: 100%;
+    background-color: #eaeaec;
+    margin-top: 7px;
+}
+.comment-size-name {
+    font-size: 12px;
+    color: #339b53;
+}
+.my-pl-con {
+    font-size: 12px;
+    color: #8b8b8b;
+    width: 100%;
+}
+.date-dz-left {
+    font-size: 12px;
+    color: #8b8b8b;
+    display: block;
+    padding-top: 18px;
+}
+.comment-time, .comment-pl-block {
+    padding-top: 7px;
+}
+.comment-pl-block {
+    margin-top: 0;
+}
+.date-dz-right {
+    display: block;
+    padding-top: 6px;
+    padding-right: 18px;
+    position: relative;
+    overflow: hidden;
+}
+.removeBlock {
+    float: left;
+    font-size: 12px;
+    color: #8b8b8b;
+    margin-right: 24px;
+    display: block;
+    opacity: 0;
+}
+.hf-con-block {
+    display: block;
+}
+.date-dz-pl, .date-dz-line, .date-dz-z {
+    font-size: 12px;
+    color: #8b8b8b;
+}
+.date-dz-line {
+    display: block;
+    padding: 0 20px;
+}
+.date-dz-z-click-red {
+    width: 17px;
+    height: 17px;
+    display: block;
+    float: left;
+    background-image: url(../images/icon-all_01.png);
+    background-repeat: no-repeat;
+    background-position: -6px -198px;
+    margin-right: 5px;
+}
+.z-num {
+    font-style: normal;
+}
+.date-dz-z-click {
+    color: #b83b44;
+}
+.red {
+    background-position: -6px -119px !important;
+}
+.hf-pl {
+    width: 70px;
+    height: 30px;
+    line-height: 30px;
+    background-color: #339b53;
+    text-align: center;
+    display: block;
+    float: right;
+    color: #FFFFFF;
+    font-size: 12px;
+    border-radius: 6px;
+    margin-right: 2px;
+    margin-top: 20px;
+}
+.hf-con{width: 100%;margin-top: 24px;}
+.hf-input{font-size: 12px;}
+.all-pl-con {
+    width: 96%;
+    padding: 2% 0;
+    float: left;
+    margin: 0 2%;
+}
+.atName {
+    font-size: 12px;
+    color: #339b53;
+}
+.hfpl-text{margin-top: 0;}
+.date-dz:hover .removeBlock {
+    opacity: 1;
+}
+.hf-list-con .all-pl-con {
+    border-top: 1px solid #d9d9d9;
+    padding-bottom: 12px;
+}
+.hf-list-con .all-pl-con:first-child {
+    border-top: 0;
+}
+
+
+
+/*----------评论区域 end----------*/
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

src/main/resources/static/assets/js/vendor/comment/css/style.css

@@ -0,0 +1,97 @@
+
+pre {
+    white-space: pre;
+    white-space: pre-wrap;
+    word-wrap: break-word;
+}
+.flex-text-wrap {
+    width: 100%;
+    position: relative;
+    *zoom: 1;
+}
+textarea,
+.flex-text-wrap {
+    outline: 0;
+    margin: 0;
+    border: none;
+    padding: 0;
+    *padding-bottom: 0!important;
+}
+.flex-text-wrap textarea,
+.flex-text-wrap pre {
+    *white-space: pre;
+    *word-wrap: break-word;
+    white-space: pre-wrap;
+    width: 100%;
+    -webkit-box-sizing: border-box;
+    -moz-box-sizing: border-box;
+    -ms-box-sizing: border-box;
+    box-sizing: border-box;
+}
+.flex-text-wrap textarea {
+    overflow: hidden;
+    position: absolute;
+    top: 0;
+    left: 0;
+    height: 100%;
+    width: 100%;
+    resize: none;
+    /* IE7 box-sizing fudge factor */
+    *height: 94%;
+    *width: 94%;
+}
+.flex-text-wrap pre {
+    display: block;
+    visibility: hidden;
+}
+.flex-text-wrap,
+textarea { margin-bottom: 25px }
+textarea,
+.flex-text-wrap pre {
+    line-height: 1.7;
+    font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+    font-size: 100%;
+    padding: 10px 15px;
+    border: 1px solid #c6c8ce;
+    width: 100%;
+    -webkit-appearance: none;
+    background: #fff;
+    -webkit-border-radius: 3px;
+    -moz-border-radius: 3px;
+    border-radius: 3px;
+    -moz-background-clip: padding;
+    -webkit-background-clip: padding-box;
+    background-clip: padding-box;
+    -webkit-box-shadow: 0 0 8px rgba(182, 195, 214, .6) inset, 0 1px 1px #fff;
+    -moz-box-shadow: 0 0 8px rgba(182, 195, 214, .6) inset, 0 1px 1px #fff;
+    box-shadow: 0 0 8px rgba(182, 195, 214, .6) inset, 0 1px 1px #fff;
+    -webkit-transition-duration: 300ms;
+    -moz-transition-duration: 300ms;
+    -o-transition-duration: 300ms;
+    -ms-transition-duration: 300ms;
+    transition-duration: 300ms;
+    -webkit-transition-easing: ease-in-out;
+    -moz-transition-easing: ease-in-out;
+    -o-transition-easing: ease-in-out;
+    -ms-transition-easing: ease-in-out;
+    transition-easing: ease-in-out;
+    -webkit-transition-property: border-color, -webkit-box-shadow;
+    -webkit-transition-property: border-color, box-shadow;
+    -moz-transition-property: border-color, -moz-box-shadow;
+    -moz-transition-property: border-color, box-shadow;
+    -o-transition-property: border-color, box-shadow;
+    -ms-transition-property: border-color, box-shadow;
+    transition-property: border-color, box-shadow;
+}
+.fork-link {
+    display: block;
+    position: absolute;
+    top: 0;
+    right: 0;
+    width: 140px;
+}
+@media only screen and (-webkit-min-device-pixel-ratio:1.25), (min-resolution:120dpi) {
+    html {
+        background-size: 51px auto;
+    }
+}

src/main/resources/static/assets/js/vendor/comment/js/jquery.flexText.js

@@ -0,0 +1,65 @@
+/*
+    此插件textarea的高度是 height:100%; 继承父元素的高度 ==> 父元素只有一个 position:relative; 用于定位textarea
+    页面中加载完毕又添加了pre标签，pre标签是以块元素存在的并且不可见，但是占用空间，
+    不像display:none;什么空间也不占。
+    所以textarea父元素的高度是通过pre撑开的(在textarea里面写入文字，文字会被添加到pre底下的span标签里，以此来撑开pre的高度)
+
+    要改变textarea初始化时的高度，只需改变pre的padding值即可，页面加载时pre里面添加<br />标签是为了让pre标签初始时有个高度
+ */
+;(function ($) {
+
+    // Constructor
+    function FT(elem) {
+        this.$textarea = $(elem);
+
+        this._init();
+    }
+
+    FT.prototype = {
+        _init: function () {
+            var _this = this;
+
+            // Insert wrapper elem & pre/span for textarea mirroring
+            this.$textarea.wrap('<div class="flex-text-wrap" />').before('<pre class="pre"><span /><br /></pre>');
+
+            this.$span = this.$textarea.prev().find('span');
+
+            // Add input event listeners
+            // * input for modern browsers
+            // * propertychange for IE 7 & 8
+            // * keyup for IE >= 9: catches keyboard-triggered undos/cuts/deletes
+            // * change for IE >= 9: catches mouse-triggered undos/cuts/deletions (when textarea loses focus)
+            this.$textarea.on('input propertychange keyup change', function () {
+                _this._mirror();
+            });
+
+            // jQuery val() strips carriage return chars by default (see http://api.jquery.com/val/)
+            // This causes issues in IE7, but a valHook can be used to preserve these chars
+            $.valHooks.textarea = {
+                get: function (elem) {
+                    return elem.value.replace(/\r?\n/g, "\r\n");
+                }
+            };
+
+            // Mirror contents once on init
+            this._mirror();
+        }
+
+        // Mirror pre/span & textarea contents
+        ,_mirror: function () {
+            this.$span.text(this.$textarea.val());
+        }
+    };
+
+    // jQuery plugin wrapper
+    $.fn.flexText = function () {
+        return this.each(function () {
+            // Check if already instantiated on this elem
+            if (!$.data(this, 'flexText')) {
+                // Instantiate & store elem + string
+                $.data(this, 'flexText', new FT(this));
+            }
+        });
+    };
+
+})(jQuery);

src/main/resources/static/assets/js/vendor/comment/json/hf.json

@@ -0,0 +1,87 @@
+[
+    {
+      "commentName":"张一",
+      "commentTime":"2017-05-11 11:01:01",
+      "commentContent":"来啊！互相伤害啊1！",
+      "len":"20",
+      "id":"1",
+      "commentHf":[
+        {
+          "hfName":"王维春",
+          "hfTime":"2017-05-11 11:01:02",
+          "hfContent":"王伟春回复的内容",
+          "atName":"张建超"
+        },
+        {
+          "hfName":"王维春2",
+          "hfTime":"2017-05-11 11:01:02",
+          "hfContent":"王伟春回复的内容2",
+          "atName":""
+        },
+        {
+          "hfName":"王维春3",
+          "hfTime":"2017-05-11 11:01:02",
+          "hfContent":"王伟春回复的内容3",
+          "atName":"张国鹏"
+        },
+        {
+          "hfName":"王维春3",
+          "hfTime":"2017-05-11 11:01:02",
+          "hfContent":"王伟春回复的内容3",
+          "atName":"张国鹏"
+        },
+        {
+          "hfName":"王维春3",
+          "hfTime":"2017-05-11 11:01:02",
+          "hfContent":"王伟春回复的内容3",
+          "atName":"张国鹏"
+        }
+      ]
+    },
+    {
+      "commentName": "张二",
+      "commentTime": "2017-05-11 11:01:01",
+      "commentContent": "来啊！互相伤害啊2！",
+      "id":"2",
+      "commentHf": [
+        {
+        "hfName": "张建超",
+        "hfTime": "2017-05-11 11:01:02",
+        "hfContent":"张建超回复的内容",
+          "atName":""
+        },
+        {
+          "hfName": "张建超2",
+          "hfTime": "2017-05-11 11:01:02",
+          "hfContent":"张建超回复的内容2",
+          "atName":"王伟春"
+        }
+      ]
+    },
+    {
+    "commentName": "张三",
+    "commentTime": "2017-05-11 11:01:01",
+    "commentContent": "来啊！互相伤害啊3！",
+    "id":"3",
+    "commentHf": [
+      {
+        "hfName": "张国鹏",
+        "hfTime": "2017-05-11 11:01:02",
+        "hfContent":"张国鹏回复的内容",
+        "atName":""
+      },
+      {
+        "hfName": "张国鹏2",
+        "hfTime": "2017-05-11 11:01:02",
+        "hfContent":"张国鹏回复的内容2",
+        "atName":"王伟春"
+      },
+      {
+        "hfName": "张国鹏3",
+        "hfTime": "2017-05-11 11:01:02",
+        "hfContent":"张国鹏回复的内容3",
+        "atName":""
+      }
+    ]
+  }
+]

src/main/resources/static/assets/js/vendor/comment/json/pl.json

@@ -0,0 +1,5 @@
+[
+  {
+
+  }
+]