@jx3box/jx3box-common-ui 8.0.16 → 8.0.18
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 +4 -4
- package/src/filters/clientBy.vue +11 -5
- package/src/filters/markBy.vue +3 -29
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@jx3box/jx3box-common-ui",
|
|
3
|
-
"version": "8.0.
|
|
3
|
+
"version": "8.0.18",
|
|
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.8.
|
|
34
|
-
"@jx3box/jx3box-common": "^8.1.
|
|
33
|
+
"@jx3box/jx3box-comment-ui": "^1.8.6",
|
|
34
|
+
"@jx3box/jx3box-common": "^8.1.9",
|
|
35
35
|
"@jx3box/jx3box-data": "^3.5.6",
|
|
36
|
-
"@jx3box/jx3box-editor": "^2.1.
|
|
36
|
+
"@jx3box/jx3box-editor": "^2.1.4",
|
|
37
37
|
"@jx3box/reporter": "^0.0.4",
|
|
38
38
|
"axios": "^0.26.1",
|
|
39
39
|
"dayjs": "^1.11.0",
|
package/src/filters/clientBy.vue
CHANGED
|
@@ -1,10 +1,13 @@
|
|
|
1
1
|
<template>
|
|
2
2
|
<div class="w-filter-client">
|
|
3
3
|
<ul>
|
|
4
|
+
<li class="u-client" :class="{on: client == ''}" @click="filter('')">
|
|
5
|
+
全部
|
|
6
|
+
</li>
|
|
4
7
|
<li
|
|
5
8
|
class="u-client"
|
|
6
9
|
:class="{ on: client == value }"
|
|
7
|
-
v-for="(label, value) in
|
|
10
|
+
v-for="(label, value) in computedClients"
|
|
8
11
|
:key="value"
|
|
9
12
|
@click="filter(value)"
|
|
10
13
|
>{{ label }}</li>
|
|
@@ -20,14 +23,17 @@ const clients = {
|
|
|
20
23
|
};
|
|
21
24
|
export default {
|
|
22
25
|
name: "clientBy",
|
|
23
|
-
props: ["type"],
|
|
26
|
+
props: ["type", "clients"],
|
|
24
27
|
data: function () {
|
|
25
28
|
return {
|
|
26
|
-
client: this.type || "
|
|
27
|
-
clients,
|
|
29
|
+
client: this.type || "",
|
|
28
30
|
};
|
|
29
31
|
},
|
|
30
|
-
computed: {
|
|
32
|
+
computed: {
|
|
33
|
+
computedClients: function () {
|
|
34
|
+
return this.clients || clients;
|
|
35
|
+
},
|
|
36
|
+
},
|
|
31
37
|
methods: {
|
|
32
38
|
filter: function (val) {
|
|
33
39
|
this.client = val;
|
package/src/filters/markBy.vue
CHANGED
|
@@ -20,32 +20,6 @@
|
|
|
20
20
|
</el-dropdown-menu>
|
|
21
21
|
</el-dropdown>
|
|
22
22
|
</span>
|
|
23
|
-
<!-- <div class="w-filter-mark" :class="{ on: visible }" v-else>
|
|
24
|
-
<span class="u-label" @click="toggleFilter">
|
|
25
|
-
<span class="u-current-filter">筛选 : {{ current || "全部" }}</span>
|
|
26
|
-
<span class="u-toggle">
|
|
27
|
-
<i class="el-icon-arrow-down"></i>
|
|
28
|
-
<i class="el-icon-arrow-up"></i>
|
|
29
|
-
</span>
|
|
30
|
-
</span>
|
|
31
|
-
<span class="u-options">
|
|
32
|
-
<span
|
|
33
|
-
class="u-mode u-all"
|
|
34
|
-
:class="{ on: mark == '' }"
|
|
35
|
-
@click="filter('')"
|
|
36
|
-
><i class="el-icon-s-operation"></i> 全部</span
|
|
37
|
-
>
|
|
38
|
-
<span
|
|
39
|
-
class="u-mode"
|
|
40
|
-
:class="{ on: mark == key }"
|
|
41
|
-
v-for="(label, key) in marks"
|
|
42
|
-
:key="key"
|
|
43
|
-
@click="filter(key)"
|
|
44
|
-
><i class="el-icon-user"></i> {{ label }}</span
|
|
45
|
-
>
|
|
46
|
-
<slot></slot>
|
|
47
|
-
</span>
|
|
48
|
-
</div> -->
|
|
49
23
|
</template>
|
|
50
24
|
|
|
51
25
|
<script>
|
|
@@ -62,9 +36,9 @@ export default {
|
|
|
62
36
|
type: String,
|
|
63
37
|
default: "",
|
|
64
38
|
},
|
|
65
|
-
|
|
39
|
+
type: {
|
|
66
40
|
type: String,
|
|
67
|
-
default: "",
|
|
41
|
+
default: "mark",
|
|
68
42
|
},
|
|
69
43
|
marks: {
|
|
70
44
|
type: Object,
|
|
@@ -91,7 +65,7 @@ export default {
|
|
|
91
65
|
},
|
|
92
66
|
filter: function(key) {
|
|
93
67
|
this.mark = key;
|
|
94
|
-
this.$emit("filter", { type:
|
|
68
|
+
this.$emit("filter", { type: this.type, val: key });
|
|
95
69
|
this.visible = false;
|
|
96
70
|
},
|
|
97
71
|
},
|