bri-components 1.4.72 → 1.4.74

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.
Files changed (6) hide show
  1. package/package.json +1 -1
  2. package/src/components/controls/senior/cascaderTable.vue +19 -17
  3. package/src/components/controls/senior/flatTable.vue +18 -17
  4. package/src/components/list/mixins/tableBaseMixin.js +8 -5
  5. package/src/components/small/DshButtons.vue +9 -3
  6. package/src/utils/table.js +1 -1
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "bri-components",
3
- "version": "1.4.72",
3
+ "version": "1.4.74",
4
4
  "author": "dengshanghui",
5
5
  "description": "a component lib for vue project",
6
6
  "main": "src/index.js",
package/src/components/controls/senior/cascaderTable.vue CHANGED
@@ -15,7 +15,7 @@
15
15
  </span>
16
16
 
17
17
  <dsh-modal
18
- class="cascaderTable-unit-fullscreen"
18
+ class="cascaderTable-fullscreen"
19
19
  v-model="showUnitModal"
20
20
  :mode="unitModalPropsObj.mode"
21
21
  :propsObj="unitModalPropsObj"
@@ -23,7 +23,7 @@
23
23
  >
24
24
  <div
25
25
  v-if="showUnitModal"
26
- class="cascaderTable-unit-fullscreen-inner"
26
+ class="cascaderTable-fullscreen-inner"
27
27
  >
28
28
  <!-- 老版级联表格 -->
29
29
  <dsh-cascader-table
@@ -35,6 +35,7 @@
35
35
  :columns="subForm"
36
36
  :propsObj="{
37
37
  ...selfPropsObj,
38
+ _contentHeight: undefined,
38
39
  _useEnlarge: false
39
40
  }"
40
41
  :allFormList="allFormList"
@@ -57,6 +58,7 @@
57
58
  :columns="subForm"
58
59
  :propsObj="{
59
60
  ...selfPropsObj,
61
+ _contentHeight: undefined,
60
62
  _useEnlarge: false
61
63
  }"
62
64
  :allFormList="allFormList"
@@ -179,24 +181,24 @@
179
181
  &-text {
180
182
 
181
183
  }
184
+ }
185
+
186
+ &-fullscreen {
187
+ &-inner {
188
+ width: 100%;
189
+ height: 100%;
190
+ padding: 10px 20px 20px;
182
191
 
183
- &-fullscreen {
184
- &-inner {
192
+ .DshCasTable,
193
+ .DshTreeTable {
185
194
  width: 100%;
186
195
  height: 100%;
187
- padding: 10px 20px;
188
-
189
- .DshCasTable,
190
- .DshTreeTable {
191
- width: 100%;
192
- height: 100%;
193
- display: flex;
194
- flex-direction: column;
195
-
196
- &-main {
197
- flex: 1;
198
- min-height: 0px;
199
- }
196
+ display: flex;
197
+ flex-direction: column;
198
+
199
+ &-main {
200
+ flex: 1;
201
+ min-height: 0px;
200
202
  }
201
203
  }
202
204
  }
package/src/components/controls/senior/flatTable.vue CHANGED
@@ -15,7 +15,7 @@
15
15
  </span>
16
16
 
17
17
  <dsh-modal
18
- class="flatTable-unit-fullscreen"
18
+ class="flatTable-fullscreen"
19
19
  v-model="showUnitModal"
20
20
  :mode="unitModalPropsObj.mode"
21
21
  :propsObj="unitModalPropsObj"
@@ -23,19 +23,20 @@
23
23
  >
24
24
  <div
25
25
  v-if="showUnitModal"
26
- class="flatTable-unit-fullscreen-inner"
26
+ class="flatTable-fullscreen-inner"
27
27
  >
28
28
  <dsh-flat-table
29
29
  :canEdit="false"
30
30
  :tableDataObj="curVal"
31
31
  :data="curVal.list"
32
32
  :rowDefault="curVal.rowDefault"
33
- :compareData="curVal.oldList"
34
33
  :columns="subForm"
35
34
  :propsObj="{
36
35
  ...propsObj,
36
+ _contentHeight: undefined,
37
37
  _useEnlarge: false
38
38
  }"
39
+ :compareData="curVal.oldList"
39
40
  :allFormList="allFormList"
40
41
  :parentObj="value"
41
42
  ></dsh-flat-table>
@@ -68,9 +69,9 @@
68
69
  :tableDataObj="curVal"
69
70
  :data="curVal.list"
70
71
  :rowDefault="curVal.rowDefault"
71
- :compareData="curVal.oldList"
72
72
  :columns="subForm"
73
73
  :propsObj="propsObj"
74
+ :compareData="curVal.oldList"
74
75
  :allFormList="allFormList"
75
76
  :parentObj="value"
76
77
  @change="change"
@@ -206,23 +207,23 @@
206
207
  &-text {
207
208
 
208
209
  }
210
+ }
211
+
212
+ &-fullscreen {
213
+ &-inner {
214
+ width: 100%;
215
+ height: 100%;
216
+ padding: 10px 20px 20px;
209
217
 
210
- &-fullscreen {
211
- &-inner {
218
+ .DshFlatTable {
212
219
  width: 100%;
213
220
  height: 100%;
214
- padding: 10px 20px;
215
-
216
- .DshFlatTable {
217
- width: 100%;
218
- height: 100%;
219
- display: flex;
220
- flex-direction: column;
221
+ display: flex;
222
+ flex-direction: column;
221
223
 
222
- &-main {
223
- flex: 1;
224
- min-height: 0px;
225
- }
224
+ &-main {
225
+ flex: 1;
226
+ min-height: 0px;
226
227
  }
227
228
  }
228
229
  }
package/src/components/list/mixins/tableBaseMixin.js CHANGED
@@ -26,10 +26,6 @@ export default {
26
26
  return [];
27
27
  }
28
28
  },
29
- total: {
30
- type: Number,
31
- default: 0
32
- },
33
29
  rowDefault: {
34
30
  type: Object,
35
31
  default () {
@@ -48,6 +44,11 @@ export default {
48
44
  return {};
49
45
  }
50
46
  },
47
+
48
+ total: {
49
+ type: Number,
50
+ default: 0
51
+ },
51
52
  compareData: {
52
53
  type: Array,
53
54
  default () {
@@ -324,7 +325,9 @@ export default {
324
325
  },
325
326
 
326
327
  contentHeight () {
327
- return this.selfPropsObj._contentHeight || 500;
328
+ return this.selfPropsObj._contentHeight === undefined
329
+ ? undefined
330
+ : this.selfPropsObj._contentHeight || 500;
328
331
  },
329
332
  showRequired () {
330
333
  return this.selfPropsObj._showRequired;
package/src/components/small/DshButtons.vue CHANGED
@@ -13,6 +13,9 @@
13
13
  <Poptip
14
14
  v-if="operationItem.tipContent"
15
15
  :key="(operationItem._key || operationItem.type) + 'poptip'"
16
+ :class="[
17
+ index ? 'dsh-margin-left8' : undefined
18
+ ]"
16
19
  trigger="hover"
17
20
  :title="operationItem.tipTitle"
18
21
  :content="operationItem.tipContent"
@@ -24,7 +27,6 @@
24
27
  :key="operationItem._key || operationItem.type"
25
28
  :style="operationItem.style"
26
29
  :class="[
27
- index ? 'dsh-margin-left8' : undefined,
28
30
  !operationItem.loading && !operationItem.customIcon && !operationItem.icon ? 'DshButtons-item' : undefined,
29
31
  itemClass,
30
32
  ]"
@@ -80,6 +82,9 @@
80
82
  <Poptip
81
83
  v-if="operationItem.tipContent"
82
84
  :key="(operationItem._key || operationItem.type) + 'poptip'"
85
+ :class="[
86
+ index ? 'dsh-margin-left8' : undefined
87
+ ]"
83
88
  trigger="hover"
84
89
  :title="operationItem.tipTitle"
85
90
  :content="operationItem.tipContent"
@@ -91,7 +96,6 @@
91
96
  :key="operationItem._key || operationItem.type"
92
97
  :style="operationItem.style"
93
98
  :class="[
94
- index ? 'dsh-margin-left8' : undefined,
95
99
  !operationItem.loading && !operationItem.customIcon && !operationItem.icon ? 'DshButtons-item' : undefined,
96
100
  itemClass,
97
101
  ]"
@@ -125,6 +129,9 @@
125
129
  <Poptip
126
130
  v-if="operationItem.tipContent"
127
131
  :key="(operationItem._key || operationItem.type) + 'poptip'"
132
+ :class="[
133
+ index ? 'dsh-margin-left8' : undefined
134
+ ]"
128
135
  trigger="hover"
129
136
  :title="operationItem.tipTitle"
130
137
  :content="operationItem.tipContent"
@@ -137,7 +144,6 @@
137
144
  :key="operationItem._key || operationItem.type"
138
145
  :style="operationItem.style"
139
146
  :class="[
140
- index ? 'dsh-margin-left8' : undefined,
141
147
  !operationItem.loading && !operationItem.customIcon && !operationItem.icon ? 'DshButtons-item' : undefined,
142
148
  itemClass,
143
149
  ]"
package/src/utils/table.js CHANGED
@@ -88,7 +88,7 @@ const transformToColumns = function (form, {
88
88
  isMultiple: true,
89
89
  maxHeight: 250,
90
90
  filterList: (
91
- col._selectFilterVals.length
91
+ col._selectFilterVals && col._selectFilterVals.length
92
92
  ? col._data.filter(item =>
93
93
  col._reverseFilter
94
94
  ? !col._selectFilterVals.includes(item._key)