@jx3box/jx3box-common-ui 7.1.4 → 7.1.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jx3box/jx3box-common-ui",
-  "version": "7.1.4",
+  "version": "7.1.6",
   "description": "JX3BOX UI",
   "main": "index.js",
   "scripts": {
@@ -30,10 +30,10 @@
     "last 2 versions"
   ],
   "dependencies": {
-    "@jx3box/jx3box-comment-ui": "^1.7.8",
-    "@jx3box/jx3box-common": "^7.7.6",
-    "@jx3box/jx3box-data": "^3.0.4",
-    "@jx3box/jx3box-editor": "^1.7.5",
+    "@jx3box/jx3box-comment-ui": "^1.7.12",
+    "@jx3box/jx3box-common": "^7.8.7",
+    "@jx3box/jx3box-data": "^3.0.9",
+    "@jx3box/jx3box-editor": "^1.8.2",
     "axios": "^0.26.1",
     "dayjs": "^1.11.0",
     "element-ui": "^2.13.2",

package/src/Breadcrumb.vue

@@ -43,7 +43,7 @@
                 <span>反馈</span>
             </a>
             <Adminbutton v-if="adminEnable" class="u-admin" />
-            <Admin v-if="adminEnable" />
+            <Admin v-if="adminEnable" :marksOptions="adminMarks" />
             <slot name="op-prepend"></slot>
         </div>
     </div>
@@ -73,6 +73,7 @@ export default {
         "overlayEnable",
         "crumbEnable",
         "withoutLeft",
+        "adminMarks"
     ],
     data: function () {
         return {

package/src/author/AuthorInfo.vue

@@ -98,8 +98,6 @@ export default {
         loadData: function () {
             return getUserInfo(this.uid).then((data) => {
                 if (data) {
-                    console.log(data);
-
                     this.data = data;
                     this.$emit("ready", this.data);
                 }

package/src/bread/Admin.vue

@@ -123,6 +123,12 @@ import User from "@jx3box/jx3box-common/js/user";
 import { cms as marks } from "@jx3box/jx3box-common/data/mark.json";
 export default {
     name: "Admin",
+    props: {
+        marksOptions: {
+            type: Object,
+            default: () => {},
+        }
+    },
     data() {
         return {
             // 可视
@@ -150,7 +156,6 @@ export default {
 
             // 角标
             mark: [],
-            mark_options: marks,
 
             // 高亮
             isHighlight: false,
@@ -197,6 +202,9 @@ export default {
         },
         isAdmin : function (){
             return User.isAdmin()
+        },
+        mark_options: function (){
+            return this.marksOptions && Object.keys(this.marksOptions) ? Object.assign({}, marks, this.marksOptions) : marks
         }
     },
     methods: {

package/src/single/PostTopic.vue

@@ -64,11 +64,12 @@ export default {
 
 <style lang="less" scoped>
 .c-post-topic {
-    }
+    margin-bottom: 10px;
+}
 .c-post-topic__banner {
     position: relative;
     height: 100px;
-    margin-top: 10px;
+    margin-top: 0;
     .c-topic-text {
         font-size: 12px;
         font-weight: 600;