@jx3box/jx3box-common-ui 7.1.5 → 7.1.6
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/package.json +5 -5
- package/src/Breadcrumb.vue +2 -1
- package/src/author/AuthorInfo.vue +0 -2
- package/src/bread/Admin.vue +9 -1
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@jx3box/jx3box-common-ui",
|
|
3
|
-
"version": "7.1.
|
|
3
|
+
"version": "7.1.6",
|
|
4
4
|
"description": "JX3BOX UI",
|
|
5
5
|
"main": "index.js",
|
|
6
6
|
"scripts": {
|
|
@@ -30,10 +30,10 @@
|
|
|
30
30
|
"last 2 versions"
|
|
31
31
|
],
|
|
32
32
|
"dependencies": {
|
|
33
|
-
"@jx3box/jx3box-comment-ui": "^1.7.
|
|
34
|
-
"@jx3box/jx3box-common": "^7.7
|
|
35
|
-
"@jx3box/jx3box-data": "^3.0.
|
|
36
|
-
"@jx3box/jx3box-editor": "^1.
|
|
33
|
+
"@jx3box/jx3box-comment-ui": "^1.7.12",
|
|
34
|
+
"@jx3box/jx3box-common": "^7.8.7",
|
|
35
|
+
"@jx3box/jx3box-data": "^3.0.9",
|
|
36
|
+
"@jx3box/jx3box-editor": "^1.8.2",
|
|
37
37
|
"axios": "^0.26.1",
|
|
38
38
|
"dayjs": "^1.11.0",
|
|
39
39
|
"element-ui": "^2.13.2",
|
package/src/Breadcrumb.vue
CHANGED
|
@@ -43,7 +43,7 @@
|
|
|
43
43
|
<span>反馈</span>
|
|
44
44
|
</a>
|
|
45
45
|
<Adminbutton v-if="adminEnable" class="u-admin" />
|
|
46
|
-
<Admin v-if="adminEnable" />
|
|
46
|
+
<Admin v-if="adminEnable" :marksOptions="adminMarks" />
|
|
47
47
|
<slot name="op-prepend"></slot>
|
|
48
48
|
</div>
|
|
49
49
|
</div>
|
|
@@ -73,6 +73,7 @@ export default {
|
|
|
73
73
|
"overlayEnable",
|
|
74
74
|
"crumbEnable",
|
|
75
75
|
"withoutLeft",
|
|
76
|
+
"adminMarks"
|
|
76
77
|
],
|
|
77
78
|
data: function () {
|
|
78
79
|
return {
|
package/src/bread/Admin.vue
CHANGED
|
@@ -123,6 +123,12 @@ import User from "@jx3box/jx3box-common/js/user";
|
|
|
123
123
|
import { cms as marks } from "@jx3box/jx3box-common/data/mark.json";
|
|
124
124
|
export default {
|
|
125
125
|
name: "Admin",
|
|
126
|
+
props: {
|
|
127
|
+
marksOptions: {
|
|
128
|
+
type: Object,
|
|
129
|
+
default: () => {},
|
|
130
|
+
}
|
|
131
|
+
},
|
|
126
132
|
data() {
|
|
127
133
|
return {
|
|
128
134
|
// 可视
|
|
@@ -150,7 +156,6 @@ export default {
|
|
|
150
156
|
|
|
151
157
|
// 角标
|
|
152
158
|
mark: [],
|
|
153
|
-
mark_options: marks,
|
|
154
159
|
|
|
155
160
|
// 高亮
|
|
156
161
|
isHighlight: false,
|
|
@@ -197,6 +202,9 @@ export default {
|
|
|
197
202
|
},
|
|
198
203
|
isAdmin : function (){
|
|
199
204
|
return User.isAdmin()
|
|
205
|
+
},
|
|
206
|
+
mark_options: function (){
|
|
207
|
+
return this.marksOptions && Object.keys(this.marksOptions) ? Object.assign({}, marks, this.marksOptions) : marks
|
|
200
208
|
}
|
|
201
209
|
},
|
|
202
210
|
methods: {
|