@jx3box/jx3box-editor 1.3.6 → 1.3.9

package/assets/css/resource.less

@@ -1,4 +1,5 @@
 .c-resource {
+    margin-right:5px;
     .u-switch {
         .u-icon {
             .size(14px);
@@ -261,6 +262,17 @@
                 fill: @primary;
             }
         }
+        .u-lv-box {
+            font-style: normal;
+            font-weight: normal;
+            font-size: 12px;
+            padding: 2px 8px;
+            border: 1px solid #8269df;
+            border-radius: 2px;
+            margin-left: 5px;
+            background: #fff;
+            color: #6843f4;
+        }
         &.el-tabs--card > .el-tabs__header .el-tabs__item {
             transition: none;
         }

package/package.json

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

package/src/BoxResource.vue

@@ -1,5 +1,5 @@
 <template>
-    <div class="c-resource">
+    <div class="c-resource c-resource__jx3box">
         <!-- 上传触发按钮 -->
         <el-button class="u-switch" type="primary" @click="openDialog" :disabled="!enable"> <img class="u-icon" svg-inline :src="boxIcon" />魔盒资源 </el-button>
 
@@ -7,8 +7,8 @@
         <el-dialog class="c-large-dialog" title="魔盒资源库" :visible.sync="dialogVisible">
             <div class="c-resource-content" v-loading="loading">
                 <div class="m-database-search">
-                    <el-input class="u-input" placeholder="请输入 ID 或 名称" v-model="query" @change="search" @keyup.enter.native="search">
-                        <template slot="prepend">ID ／名称</template>
+                    <el-input class="u-input" :placeholder="placeholderText" v-model="query" @change="search" @keyup.enter.native="search">
+                        <template slot="prepend">关键词</template>
                     </el-input>
                 </div>
 
@@ -17,6 +17,7 @@
                         <span slot="label" class="u-tab-label">
                             <i class="el-icon-s-custom" style="margin-right:5px;"></i>
                             <b>魔盒用户</b>
+                            <i class="u-lv-box">Lv2+</i>
                         </span>
                         <p v-if="total && done" class="m-resource-count">
                             <i class="el-icon-s-data"></i> 共找到 <b>{{ total }}</b> 条记录
@@ -85,12 +86,11 @@
 </template>
 
 <script>
-import { loadResource, loadStat, getIcons } from "../service/database";
+import { loadStat, } from "../service/database";
 import { loadAuthors, loadEmotions } from "../service/cms";
 import { getUserInfo } from "../service/author";
 import { __iconPath, __Root, __OriginRoot, __imgPath } from "@jx3box/jx3box-common/data/jx3box.json";
-import detach_types from "../assets/data/detach_type.json";
-import { iconLink, getLink, showAvatar } from "@jx3box/jx3box-common/js/utils";
+import { getLink, showAvatar } from "@jx3box/jx3box-common/js/utils";
 import User from "@jx3box/jx3box-common/js/user";
 export default {
     name: "Resource",
@@ -130,10 +130,18 @@ export default {
             per: 10,
             page: 1,
             total: 1,
-            pages: 1
+            pages: 1,
+
+            placeholderTexts : {
+                'authors' : '请输入 ID 或 名称'
+            }
+
         };
     },
     computed: {
+        placeholderText : function (){
+            return this.placeholderTexts[this.type]
+        },
         buttonTXT: function() {
             return this.selectedCount ? "插 入" : "确 定";
         },
@@ -262,10 +270,14 @@ export default {
         insert: function() {
             if (this.type === 'authors') {
                 if (this.userStatus == 0 && this.canInsertAuthor) {
-                    this.setAuthors();
-                    this.$emit("insert", this.html);
-                    this.dialogVisible = false;
-                    this.selectedAuthor = {};
+                    if (this.selectedAuthor.ID) {
+                        this.setAuthors();
+                        this.$emit("insert", this.html);
+                        this.dialogVisible = false;
+                        this.selectedAuthor = {};
+                    } else {
+                        this.$message.warning("请选择一个用户");
+                    }
                 } else {
                     this.$alert('您的等级不足或无权限（Lv2以上可用）', '消息');
                 }