bri-components 1.4.64 → 1.4.66
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 +1 -1
- package/src/components/controls/base/DshDate/DshDate.vue +1 -1
- package/src/components/controls/base/DshDate/DshDaterange.vue +2 -2
- package/src/components/controls/mixins/dateMixin.js +4 -10
- package/src/components/form/searchMixin.js +1 -1
- package/src/components/list/DshFlatTable.vue +4 -4
- package/src/components/list/DshTreeTable.vue +0 -22
- package/src/components/list/mixins/DshCascaderTableMixin.js +1 -1
- package/src/components/list/mixins/DshFlatTableMixin.js +1 -1
- package/src/components/list/mixins/tableBaseMixin.js +15 -11
- package/src/components/unit/DshFormUnit.vue +10 -3
package/package.json
CHANGED
|
@@ -18,7 +18,7 @@
|
|
|
18
18
|
<template v-else-if="['date', 'datetime', 'year', 'month'].includes(subType)">
|
|
19
19
|
<DatePicker
|
|
20
20
|
class="DshDaterange-left"
|
|
21
|
-
:
|
|
21
|
+
:value="curVal0"
|
|
22
22
|
:type="subType"
|
|
23
23
|
:disabled="disabled"
|
|
24
24
|
:options="options0"
|
|
@@ -45,7 +45,7 @@
|
|
|
45
45
|
|
|
46
46
|
<DatePicker
|
|
47
47
|
class="DshDaterange-right"
|
|
48
|
-
:
|
|
48
|
+
:value="curVal1"
|
|
49
49
|
:type="subType"
|
|
50
50
|
:disabled="disabled"
|
|
51
51
|
:options="options1"
|
|
@@ -80,26 +80,20 @@ export default {
|
|
|
80
80
|
|
|
81
81
|
/* -------- 方法 ------- */
|
|
82
82
|
getVal (val) {
|
|
83
|
-
return this
|
|
83
|
+
return this.$isDynDate(val)
|
|
84
84
|
? val
|
|
85
|
-
: this.$
|
|
85
|
+
: this.$transformToDateObj(val);
|
|
86
86
|
},
|
|
87
87
|
transformVal (val) {
|
|
88
|
-
return this
|
|
88
|
+
return this.$isDynDate(val)
|
|
89
89
|
? val
|
|
90
90
|
: this.$transformToDateStr(val, "-", this.subType);
|
|
91
91
|
},
|
|
92
92
|
getShowVal (val) {
|
|
93
|
-
return this
|
|
93
|
+
return this.$isDynDate(val)
|
|
94
94
|
? (this.dynDateList.find(dynDateItem => dynDateItem._key === val) || { name: `"${val}"动态时间不存在` }).name
|
|
95
95
|
: this.$transformToDateStr(val, "-", this.subType);
|
|
96
96
|
},
|
|
97
|
-
isDynDate (val) {
|
|
98
|
-
return val && typeof val === "string" && (
|
|
99
|
-
this.dynDateList.some(dynDateItem => dynDateItem._key === val) ||
|
|
100
|
-
["dyn", "year", "month", "days", "start", "end"].some(str => val.includes(str))
|
|
101
|
-
);
|
|
102
|
-
},
|
|
103
97
|
|
|
104
98
|
getShortCuts (index) {
|
|
105
99
|
return this.useDynDate
|
|
@@ -74,12 +74,12 @@
|
|
|
74
74
|
>
|
|
75
75
|
<dsh-page
|
|
76
76
|
:mode="pageMode"
|
|
77
|
-
:total="
|
|
77
|
+
:total="selfTotal"
|
|
78
78
|
:propsObj="pagePropsObj"
|
|
79
79
|
@changePage="changePage"
|
|
80
80
|
@changePageSize="changePageSize"
|
|
81
81
|
>
|
|
82
|
-
共 {{
|
|
82
|
+
共 {{ selfTotal }} 条
|
|
83
83
|
|
|
84
84
|
<span
|
|
85
85
|
class="DshFlatTable-sort"
|
|
@@ -184,12 +184,12 @@
|
|
|
184
184
|
>
|
|
185
185
|
<dsh-page
|
|
186
186
|
:mode="pageMode"
|
|
187
|
-
:total="
|
|
187
|
+
:total="selfTotal"
|
|
188
188
|
:propsObj="pagePropsObj"
|
|
189
189
|
@changePage="changePage"
|
|
190
190
|
@changePageSize="changePageSize"
|
|
191
191
|
>
|
|
192
|
-
共 {{
|
|
192
|
+
共 {{ selfTotal }} 条
|
|
193
193
|
|
|
194
194
|
<span
|
|
195
195
|
class="DshFlatTable-sort"
|
|
@@ -20,28 +20,6 @@
|
|
|
20
20
|
@changeSelect="changeSelect"
|
|
21
21
|
@selectAll="changeSelect"
|
|
22
22
|
></bri-table>
|
|
23
|
-
<!-- <bri-table
|
|
24
|
-
v-show="showListData.length"
|
|
25
|
-
class="DshTreeTable-main"
|
|
26
|
-
:isLoading="isLoading"
|
|
27
|
-
:columns="showColumns"
|
|
28
|
-
:data="isLoading ? [] : renderedListData"
|
|
29
|
-
:footer-data="footerData"
|
|
30
|
-
:propsObj="tablePropsObj"
|
|
31
|
-
@changeSelect="changeSelect"
|
|
32
|
-
@selectAll="changeSelect"
|
|
33
|
-
></bri-table>
|
|
34
|
-
<bri-table
|
|
35
|
-
v-if="!showListData.length"
|
|
36
|
-
class="DshTreeTable-main"
|
|
37
|
-
:isLoading="isLoading"
|
|
38
|
-
:columns="showColumns"
|
|
39
|
-
:data="[]"
|
|
40
|
-
:footer-data="footerData"
|
|
41
|
-
:propsObj="tablePropsObj"
|
|
42
|
-
@changeSelect="changeSelect"
|
|
43
|
-
@selectAll="changeSelect"
|
|
44
|
-
></bri-table> -->
|
|
45
23
|
|
|
46
24
|
<!-- 添加行 -->
|
|
47
25
|
<dsh-render :render="createBtnRender"></dsh-render>
|
|
@@ -52,7 +52,7 @@ export default {
|
|
|
52
52
|
},
|
|
53
53
|
// 顶替tableBaseMixin里的
|
|
54
54
|
searchTitle () {
|
|
55
|
-
return `${this.isSearching ? "筛选" : "全部"}数据${this.isMergeRowTable ? `，共 ${this.
|
|
55
|
+
return `${this.isSearching ? "筛选" : "全部"}数据${this.isMergeRowTable ? `，共 ${this.selfTotal}条；` : "；"}`;
|
|
56
56
|
},
|
|
57
57
|
|
|
58
58
|
allListData () {
|
|
@@ -26,18 +26,16 @@ export default {
|
|
|
26
26
|
return [];
|
|
27
27
|
}
|
|
28
28
|
},
|
|
29
|
+
total: {
|
|
30
|
+
type: Number,
|
|
31
|
+
default: 0
|
|
32
|
+
},
|
|
29
33
|
rowDefault: {
|
|
30
34
|
type: Object,
|
|
31
35
|
default () {
|
|
32
36
|
return {};
|
|
33
37
|
}
|
|
34
38
|
},
|
|
35
|
-
compareData: {
|
|
36
|
-
type: Array,
|
|
37
|
-
default () {
|
|
38
|
-
return [];
|
|
39
|
-
}
|
|
40
|
-
},
|
|
41
39
|
columns: {
|
|
42
40
|
type: Array,
|
|
43
41
|
default () {
|
|
@@ -50,6 +48,12 @@ export default {
|
|
|
50
48
|
return {};
|
|
51
49
|
}
|
|
52
50
|
},
|
|
51
|
+
compareData: {
|
|
52
|
+
type: Array,
|
|
53
|
+
default () {
|
|
54
|
+
return [];
|
|
55
|
+
}
|
|
56
|
+
},
|
|
53
57
|
|
|
54
58
|
allFormList: {
|
|
55
59
|
type: Array,
|
|
@@ -485,14 +489,14 @@ export default {
|
|
|
485
489
|
: [];
|
|
486
490
|
},
|
|
487
491
|
// 全部数据 或 筛选时符合条件的数据 -总数
|
|
488
|
-
|
|
489
|
-
return this.showListData.length;
|
|
492
|
+
selfTotal () {
|
|
493
|
+
return this.total || this.showListData.length;
|
|
490
494
|
},
|
|
491
495
|
// 全部数据 或 筛选时符合条件的数据 -共多少分页
|
|
492
496
|
PageNum () {
|
|
493
|
-
return this.
|
|
494
|
-
? Math.ceil(this.
|
|
495
|
-
: Math.floor(this.
|
|
497
|
+
return this.selfTotal % this.pagePropsObj.pagesize > 0
|
|
498
|
+
? Math.ceil(this.selfTotal / this.pagePropsObj.pagesize)
|
|
499
|
+
: Math.floor(this.selfTotal / this.pagePropsObj.pagesize);
|
|
496
500
|
},
|
|
497
501
|
|
|
498
502
|
parentDataId () {
|
|
@@ -3,8 +3,9 @@
|
|
|
3
3
|
:class="[
|
|
4
4
|
{
|
|
5
5
|
'DshFormUnit': true,
|
|
6
|
-
|
|
7
|
-
'DshFormUnit-line': formItem._line
|
|
6
|
+
[`DshFormUnit-type-${formItem._type}`]: true,
|
|
7
|
+
'DshFormUnit-line': formItem._line,
|
|
8
|
+
'DshFormUnit-required': canEdit && formItem._required
|
|
8
9
|
},
|
|
9
10
|
formControlClass
|
|
10
11
|
]"
|
|
@@ -28,7 +29,7 @@
|
|
|
28
29
|
'DshFormUnit-label-name-show': !canEdit
|
|
29
30
|
}">
|
|
30
31
|
<slot name="label">
|
|
31
|
-
{{ formItem.
|
|
32
|
+
{{ formItem._name }}
|
|
32
33
|
|
|
33
34
|
<!-- 有更新标记-->
|
|
34
35
|
<span
|
|
@@ -308,6 +309,12 @@
|
|
|
308
309
|
}
|
|
309
310
|
}
|
|
310
311
|
|
|
312
|
+
&-type {
|
|
313
|
+
&-tag {
|
|
314
|
+
padding: 2px 10px 6px;
|
|
315
|
+
}
|
|
316
|
+
}
|
|
317
|
+
|
|
311
318
|
// 左右显示时
|
|
312
319
|
&-line {
|
|
313
320
|
display: flex;
|