@jx3box/jx3box-common-ui 7.2.8 → 7.3.1

package/assets/css/like2.less

@@ -1,19 +1,21 @@
-.w-like2 {
-    .pointer;
-    .dbi;
-    .u-icon {
-        .size(28px);
-        .y;
-        .pr;
-        top:-4px;
-    }
-    .u-count {
-        color: #888;
-        .ml(10px);
-    }
-
-    &.disabled{
-      .tm(0.5);
-      cursor: default;
-    }
-}
+.w-like2 {
+    .pointer;
+    .dbi;
+    .pr;
+    top: 2px;
+    .u-icon {
+        .size(28px);
+        .y;
+        .pr;
+        top:-4px;
+    }
+    .u-count {
+        color: #888;
+        .ml(10px);
+    }
+
+    &.disabled{
+      .tm(0.5);
+      cursor: default;
+    }
+}

package/assets/css/main.less

@@ -20,6 +20,12 @@ a{
         .none;
     }
 }
+.c-main.expanding-right {
+    .mr(0) !important;
+    .c-sidebar-right{
+        .db;
+    }
+}
 .c-main.without-left{
     .ml(0) !important;
 }
@@ -62,4 +68,4 @@ a{
             .mt(0);
         }
     }
-}
+}

package/assets/css/right-sidebar.less

@@ -1,26 +1,35 @@
 .c-sidebar-right{
-    // .pa;.lt(100%,0);
-    .pf;.rt(0,@header-height + @bread-height);.z(400);
-    bottom:0;
     .w(@aside-right);
-    background-color:#fff;
-    border-left:1px solid #eee;
-    // height:100%;
     box-sizing: border-box;
+    padding: 10px;
+    .pf;
+    .z(600);
+    right: 0;
+    top: @header-height + @bread-height;
+    bottom: 0;
+    background-color: @bg-light;
+    border-left: 1px solid #eee;
+}
 
+.c-sidebar-right-inner {
+    .size(100%);
     overflow-y: auto;
+
     &::-webkit-scrollbar {
         width: 4px;
     }
+
     &::-webkit-scrollbar-track,
     &::-webkit-scrollbar-track-piece {
         background-color: #fafafa;
         border-radius: 6px;
     }
+
     &::-webkit-scrollbar-thumb {
         background-color: #eee;
         border-radius: 6px;
     }
+
     &::-webkit-scrollbar-button,
     &::-webkit-scrollbar-corner,
     &::-webkit-resizer {
@@ -81,6 +90,75 @@
     }
 }
 
+// 折叠相关逻辑
+.c-sidebar-right-toggle {
+    display: block;
+    .pa;
+    .lb(-21px, calc(50% - 20px));
+    width: 20px;
+    height: 40px;
+    line-height: 40px;
+    .pointer;
+    text-align: center;
+    background-color: @bg-light;
+    border-left: 1px solid #eee;
+    border-top: 1px solid #eee;
+    border-bottom: 1px solid #eee;
+    border-radius: 0px 2px 2px 0px;
+    font-size: 16px;
+    color: #999;
+
+    &:hover {
+        color: #222;
+    }
+
+    &.close-sidebar-right {
+        left: 0;
+    }
+
+    svg {
+        fill: @color;
+    }
+}
+
+.closeLeftSidebar() {
+    transition: 0.2s ease-in-out;
+    transform: translateX(100%);
+}
+
+.openLeftSidebar() {
+    transition: 0.2s ease-in-out;
+    transform: translateX(0);
+}
+
+.c-sidebar-right.is-close {
+    .closeLeftSidebar();
+
+    .c-sidebar-right-toggle {
+        transition: 0.2s ease-in-out;
+        transform: translateX(-100%);
+    }
+}
+
+.c-sidebar-right.is-open {
+    .openLeftSidebar();
+
+    .c-sidebar-right-toggle {
+        transition: 0.2s ease-in-out;
+        transform: translateX(0);
+    }
+}
+
+@media screen and (max-width: @ipad) {
+    .c-sidebar-right-toggle {
+        .none;
+    }
+
+    .c-sidebar-right.isopen {
+        box-shadow: 2px 0 3px rgba(0, 0, 0, 0.1);
+    }
+}
+
 // 笔记本<1440 缩小双边栏
 // @media screen and (max-width:@notebook){
 //     .c-sidebar-right{
@@ -88,7 +166,7 @@
 //     }
 // }
 
-// // 平板横屏
+// 平板横屏
 @media screen and (max-width:@smallpc){
     .c-sidebar-right{
         .ps;
@@ -99,4 +177,4 @@
 
 @media print{
     .c-sidebar-right{.none;}
-}
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jx3box/jx3box-common-ui",
-  "version": "7.2.8",
+  "version": "7.3.1",
   "description": "JX3BOX UI",
   "main": "index.js",
   "scripts": {

package/src/LeftSidebar.vue

@@ -18,18 +18,8 @@
             @click="toggleLeftSide"
             :title="isOpen ? '收起侧边栏' : '打开侧边栏'"
         >
-            <!-- <img
-        v-show="isOpen"
-        svg-inline
-        src="../assets/img/leftsidebar/close.svg"
-      /> -->
             <span v-show="isOpen"><i class="el-icon-arrow-left"></i></span>
             <span v-show="!isOpen"><i class="el-icon-arrow-right"></i></span>
-            <!-- <img
-        v-show="!isOpen"
-        svg-inline
-        src="../assets/img/leftsidebar/open.svg"
-      /> -->
         </span>
     </aside>
 </template>
@@ -39,7 +29,6 @@ import Bus from "../service/bus";
 import { isApp } from "../assets/js/app.js";
 import { getDecoration } from "../service/cms";
 import { __imgPath } from "@jx3box/jx3box-common/data/jx3box.json";
-import User from "@jx3box/jx3box-common/js/user";
 const DECORATION_SIDEBAR = "decoration_sidebar";
 export default {
     name: "LeftSidebar",

package/src/Main.vue

@@ -1,11 +1,11 @@
 <template>
     <main
         class="c-main"
-        :class="{
-            'without-right': withoutRight,
-            'without-left': expanding,
-            'without-bread': withoutBread,
-        }"
+        :class="[
+            withoutRight ? 'without-right' : expandingRight ? 'expanding-right' : '',
+            {'without-left': expanding},
+            {'without-bread': withoutBread},
+        ]"
     >
         <slot></slot>
     </main>
@@ -19,6 +19,7 @@ export default {
     data: function() {
         return {
             expanding: false,
+            expandingRight: false,
         };
     },
     computed: {
@@ -30,16 +31,24 @@ export default {
         withoutLeft: function(newval) {
             this.expanding = this.withoutLeft === undefined ? false : newval;
         },
+        withoutRight: function(newval) {
+            this.expandingRight = this.withoutRight === undefined ? false : newval;
+        },
     },
     methods: {},
     mounted: function() {
         Bus.$on("toggleLeftSide", (data) => {
             this.expanding = !data;
         });
+        Bus.$on("toggleRightSide", (data) => {
+            this.expandingRight = !data;
+        });
     },
     created: function() {
         this.expanding =
             this.withoutLeft === undefined ? false : !!this.withoutLeft;
+        this.expandingRight =
+            this.withoutRight === undefined ? false : !!this.withoutRight;
     },
 };
 </script>

package/src/RightSidebar.vue

@@ -1,10 +1,22 @@
 <template>
-    <aside class="c-sidebar-right c-sidebar" v-if="!isApp">
-        <slot></slot>
+    <aside class="c-sidebar-right c-sidebar" v-if="!isApp" :class="isOpen ? 'is-open' : 'is-close'">
+        <div class="c-sidebar-right-inner">
+            <slot></slot>
+        </div>
+        <span
+            class="c-sidebar-right-toggle"
+            :class="!isOpen && 'close-sidebar-right'"
+            @click="toggleRightSide"
+            :title="isOpen ? '收起侧边栏' : '打开侧边栏'"
+        >
+            <span v-show="!isOpen"><i class="el-icon-arrow-left"></i></span>
+            <span v-show="isOpen"><i class="el-icon-arrow-right"></i></span>
+        </span>
     </aside>
 </template>
 
 <script>
+import Bus from "../service/bus";
 import { isApp } from "../assets/js/app.js";
 export default {
     name: "RightSidebar",
@@ -12,11 +24,28 @@ export default {
     data: function() {
         return {
             isApp: isApp(),
+            isOpen: true,
         };
     },
     computed: {},
-    methods: {},
-    mounted: function() {},
+    methods: {
+        toggleRightSide: function () {
+            Bus.$emit("toggleRightSide", !this.isOpen);
+        },
+    },
+    mounted: function() {
+        Bus.$on("toggleRightSide", (data) => {
+            this.isOpen = data;
+        });
+
+        if (window.innerWidth < 1024) {
+            this.isOpen = false;
+
+            document.addEventListener("click", function () {
+                Bus.$emit("toggleRightSide", false);
+            });
+        }
+    },
 };
 </script>
 

package/src/interact/Like2.vue

@@ -11,7 +11,7 @@
                 <img
                     class="u-icon"
                     svg-inline
-                    src="../../assets/img/widget/like2.svg"
+                    :src="likeImg"
                 />
                 <span class="u-count" v-if="count">{{ count }}</span>
             </div>
@@ -21,7 +21,6 @@
 
 <script>
 import { postStat, getStat } from "@jx3box/jx3box-common/js/stat";
-import { getRewrite } from "@jx3box/jx3box-common/js/utils";
 import _ from "lodash";
 export default {
     name: "Like2",
@@ -30,6 +29,8 @@ export default {
         return {
             status: true,
             count: 0,
+
+            likeImg: require("../../assets/img/widget/like4.png"),
         };
     },
     computed: {
@@ -49,11 +50,15 @@ export default {
         // 点赞
         addLike: function () {
             if (!this.ready) return;
+            this.likeImg = require("../../assets/img/widget/like4ing.gif");
             this.count++;
             if (this.status) {
                 postStat(this.postType, this.postId, "likes");
             }
             this.status = false;
+            _.debounce(() => {
+                this.likeImg = require("../../assets/img/widget/like4.png");
+            }, 2800)();
         },
     },
     watch : {