@jx3box/jx3box-editor 1.3.0 → 1.3.3

package/assets/css/module/author.less

@@ -1,10 +1,11 @@
 .w-author {
     .w-author-wrapper {
-        @max-width: 345px;
-        @min-width: 200px;
+        @max-width: 280px;
+        @min-width: 280px;
         max-width: @max-width;
         min-width: @min-width;
-        padding: 9px 10px 10px;
+        width: 280px;
+        padding: 10px;
         background-color: #fff;
         box-sizing: border-box;
 
@@ -154,10 +155,12 @@
                     // color:@color-link;
                 }
                 .r(3px);
+                padding:0 5px;
+    display: flex;
+    align-items: center;
             }
             .u-team-logo {
-                .size(24px);
-                .y;
+                .size(22px);
                 .mr(4px);
                 .r(4px);
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jx3box/jx3box-editor",
-  "version": "1.3.0",
+  "version": "1.3.3",
   "description": "JX3BOX Article & Editor",
   "main": "index.js",
   "scripts": {

package/src/Author.vue

@@ -6,7 +6,7 @@
                 <div class="u-info">
                     <a class="u-name" :href="authorLink(uid)" target="_blank">
                         <span>{{ data.display_name.slice(0, 8) }}</span>
-                        <a class="u-superauthor" href="/dashboard/#/cooperation" target="_blank">
+                        <a class="u-superauthor" href="/dashboard/cooperation" target="_blank">
                             <img :src="super_author_icon" alt="superauthor" />
                         </a>
                     </a>
@@ -97,7 +97,6 @@ export default {
         },
         loadMedals: function() {
             return getUserMedals(this.uid).then((data) => {
-                console.log(data)
                 this.medals = data;
             });
         },
@@ -131,15 +130,20 @@ export default {
 @import "../assets/css/module/author.less";
 .w-author {
     .w-author-wrapper {
+        .u-author{
+            padding:5px 0 15px 0;
+        }
         .u-avatar {
             .fl;
             .mr(15px);
-            .size(48px);
         }
         img {
             border: none;
+            margin:0;
+            padding:0;
         }
         a {
+            .lh(28px);
             text-decoration: none;
             &:hover {
                 text-decoration: none;

package/src/Resource.vue

@@ -1,7 +1,7 @@
 <template>
     <div class="c-resource">
         <!-- 上传触发按钮 -->
-        <el-button class="u-switch" type="primary" @click="openDialog" :disabled="!enable"> <img class="u-icon" svg-inline src="../assets/img/jx3.svg" />插入资源 </el-button>
+        <el-button class="u-switch" type="primary" @click="openDialog" :disabled="!enable"> <img class="u-icon" svg-inline src="../assets/img/jx3.svg" />剑三资源 </el-button>
 
         <!-- 弹出界面 -->
         <el-dialog class="c-large-dialog" title="剑三数据库" :visible.sync="dialogVisible">
@@ -166,7 +166,7 @@
                     </el-tab-pane>
                     <el-tab-pane label="魔盒用户" name="authors">
                         <span slot="label" class="u-tab-label">
-                            <i class="el-icon-s-custom"></i>
+                            <i class="el-icon-s-custom" style="margin-right:5px;"></i>
                             <b>魔盒用户</b>
                         </span>
                         <p v-if="total && done" class="m-resource-count">
@@ -180,6 +180,9 @@
                                     <span class="u-name">
                                         {{ o.display_name }}
                                     </span>
+                                    <div class="u-remark">
+                                        {{o.user_bio}}
+                                    </div>
                                 </span>
                             </li>
                         </ul>
@@ -386,7 +389,7 @@ export default {
                         this.done = true;
                         this.loading = false;
                     });
-           
+
             } else if (this.type === 'emotions') {
                 this.per = 30;
                 params = {
@@ -450,10 +453,11 @@ export default {
             try {
                 let author = sessionStorage.getItem("atAuthor");
                 if (author) {
-                    author = JSON.parse(author);
                     author = author.split(',') || [];
-                    author.push(this.selectedAuthor.id);
+                    author.push(this.selectedAuthor.ID);
                     sessionStorage.setItem("atAuthor", JSON.stringify(author.join(',')));
+                } else {
+                    sessionStorage.setItem("atAuthor", JSON.stringify(this.selectedAuthor.ID));
                 }
             } catch (error) {
                 console.log(error)
@@ -465,9 +469,9 @@ export default {
                     this.setAuthors();
                     this.$emit("insert", this.html);
                     this.dialogVisible = false;
-                    this.selectAuthor = {};
+                    this.selectedAuthor = {};
                 } else {
-                    this.$message.error("您的等级不足或无权限，无法插入用户资源");
+                    this.$alert('您的等级不足或无权限（Lv2以上可用）', '消息');
                     return;
                 }
             } else {
@@ -529,9 +533,9 @@ export default {
         },
         selectAuthor: function (o){
             this.resetItems();
-            this.selectAuthor = o;
+            this.selectedAuthor = o;
             o.isSelected = true;
-            this.html = `<a data-type="author" class="e-jx3-author w-jx3-element" data-mode="" data-id="${o.ID}" target="_blank" href="/author/${o.ID}">【${o.display_name}】</a>`
+            this.html = `<a data-type="author" class="e-jx3-author w-jx3-element" data-mode="" data-id="${o.ID}" target="_blank" href="/author/${o.ID}">@${o.display_name}</a>`
         },
         selectEmotion: function (o){
             this.resetItems();
@@ -560,14 +564,13 @@ export default {
             return domain + getLink(type,id).slice(1)
         },
         userAvatar: function(url) {
-            return showAvatar(url);
+            return showAvatar(url,'m');
         },
         loadUserInfo: function (){
             if (!this.uid) return;
-            return getUserInfo(this.uid)
-                .then((data) => {
-                    this.userInfo = data;
-                })
+            getUserInfo(this.uid).then(res => {
+                this.userInfo = res
+            })
         },
 
         // 杂项