bri-components 1.2.94 → 1.2.96

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 (20) hide show
  1. package/lib/0.bri-components.min.js +1 -1
  2. package/lib/1.bri-components.min.js +1 -1
  3. package/lib/10.bri-components.min.js +1 -1
  4. package/lib/11.bri-components.min.js +1 -1
  5. package/lib/2.bri-components.min.js +1 -1
  6. package/lib/3.bri-components.min.js +1 -1
  7. package/lib/4.bri-components.min.js +1 -1
  8. package/lib/5.bri-components.min.js +1 -1
  9. package/lib/6.bri-components.min.js +1 -1
  10. package/lib/7.bri-components.min.js +1 -1
  11. package/lib/8.bri-components.min.js +1 -1
  12. package/lib/9.bri-components.min.js +1 -1
  13. package/lib/bri-components.min.js +9 -9
  14. package/package.json +1 -1
  15. package/src/components/controls/control.less +1 -1
  16. package/src/components/list/DshBox/DshPanel.vue +19 -9
  17. package/src/components/list/DshCascaderTable.vue +1 -1
  18. package/src/components/other/BriCollapseTree.vue +5 -1
  19. package/src/components/other/BriLoading.vue +2 -6
  20. package/src/styles/components/other/BriCollapseTree.less +53 -24
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "bri-components",
3
- "version": "1.2.94",
3
+ "version": "1.2.96",
4
4
  "author": "dengshanghui",
5
5
  "description": "a component lib for vue project",
6
6
  "main": "src/index.js",
package/src/components/controls/control.less CHANGED
@@ -172,13 +172,13 @@
172
172
  .ivu-radio-inner {
173
173
  width: 14px;
174
174
  height: 14px;
175
+ background-color: transparent;
175
176
 
176
177
  &::after {
177
178
  width: 6px;
178
179
  height: 6px;
179
180
  left: 2px;
180
181
  top: 2px;
181
- background-color: transparent;
182
182
  }
183
183
  }
184
184
  .ivu-checkbox-inner {
package/src/components/list/DshBox/DshPanel.vue CHANGED
@@ -63,15 +63,12 @@
63
63
  <div
64
64
  class="DshPanel-group-list"
65
65
  >
66
- <div class="list">
67
- <!-- 空数据 -->
68
- <bri-loading
69
- v-if="!groupItem.list.length"
70
- class="list-loading"
71
- :value="2"
72
- :noText="selfPropsObj.noDataText"
73
- ></bri-loading>
74
-
66
+ <div
67
+ :class="{
68
+ 'list': true,
69
+ 'list-nodata': !groupItem.list.length
70
+ }"
71
+ >
75
72
  <CheckboxGroup
76
73
  class="list-drag"
77
74
  v-model="groupItem.selectIds"
@@ -99,6 +96,7 @@
99
96
  @click="clickRow(dataItem, dataIndex)"
100
97
  >
101
98
  <dsh-icons
99
+ v-if="dragOperationObj"
102
100
  class="row-item-move"
103
101
  :list="[{
104
102
  customIcon: 'bico-tuodong',
@@ -170,6 +168,13 @@
170
168
  </dsh-draggable>
171
169
  </CheckboxGroup>
172
170
 
171
+ <!-- 空数据 -->
172
+ <bri-loading
173
+ v-if="!groupItem.list.length"
174
+ class="list-loading"
175
+ :value="2"
176
+ :noText="selfPropsObj.noDataText"
177
+ ></bri-loading>
173
178
  <!-- 提示语 -->
174
179
  <div
175
180
  v-if="groupItem.loading"
@@ -612,6 +617,11 @@
612
617
  }
613
618
 
614
619
  &-loading {
620
+ height: calc(100% - 100px);
621
+ margin-bottom: 10px;
622
+ }
623
+
624
+ &-nodata {
615
625
  background: #fff;
616
626
  border: 1px solid @borderColor;
617
627
  border-radius: 4px;
package/src/components/list/DshCascaderTable.vue CHANGED
@@ -819,7 +819,7 @@
819
819
 
820
820
  &-top {
821
821
  width: 100%;
822
- height: 40px;
822
+ height: 48px;
823
823
  overflow: hidden;
824
824
  position: absolute;
825
825
  top: 0px;
package/src/components/other/BriCollapseTree.vue CHANGED
@@ -61,12 +61,16 @@
61
61
 
62
62
  <div class="BriCollapseTree-listItem-grey">
63
63
  <Tooltip
64
+ v-if="listItem._description"
64
65
  placement="right"
65
66
  max-width="300"
66
67
  :content="listItem._description"
67
68
  >
68
- {{ listItem._simpleDescription }}
69
+ <span class="BriCollapseTree-listItem-rightText">
70
+ {{ listItem._simpleDescription }}
71
+ </span>
69
72
  </Tooltip>
73
+ <span v-else class="BriCollapseTree-listItem-rightText">{{ listItem._simpleDescription }}</span>
70
74
  </div>
71
75
  </div>
72
76
  </li>
package/src/components/other/BriLoading.vue CHANGED
@@ -18,9 +18,7 @@
18
18
  <div
19
19
  v-if="showLoadingText"
20
20
  class="BriLoading-main-loadingText"
21
- >
22
- {{ loadText }}
23
- </div>
21
+ >{{ loadText }}</div>
24
22
  </slot>
25
23
  </template>
26
24
  <!-- nodata -->
@@ -30,9 +28,7 @@
30
28
  <div
31
29
  v-if="noText"
32
30
  class="BriLoading-main-noText"
33
- >
34
- {{ noText }}
35
- </div>
31
+ >{{ noText }}</div>
36
32
  </slot>
37
33
  </template>
38
34
  </div>
package/src/styles/components/other/BriCollapseTree.less CHANGED
@@ -1,37 +1,62 @@
1
1
  .BriCollapseTree {
2
2
  &-listItem {
3
- display: flex;
4
- justify-content: space-between;
5
- padding: 6px 12px;
6
- line-height: 20px;
7
- cursor: pointer;
8
- &-text {
9
- }
10
- &-grey {
11
- text-align: right;
12
- color: @textColor;
13
- margin-left: 10px;
14
- }
15
- &:hover {
16
- background: @bgColor;
17
- }
18
- &-current {
19
- font-weight: normal;
20
- color: @themeColor;
21
- }
22
- &-disabled {
23
- cursor: not-allowed;
24
- }
3
+ display: flex;
4
+ justify-content: space-between;
5
+ padding: 6px 12px;
6
+ line-height: 20px;
7
+ cursor: pointer;
8
+
9
+ &-text {
10
+ word-break: break-word;
11
+ flex: 1;
12
+ min-width: 120px;
13
+ }
14
+
15
+ &-grey {
16
+ text-align: right;
17
+ color: @textColor;
18
+ margin-left: 0px;
19
+ }
20
+
21
+ &-rightText {
22
+ min-width: 50px;
23
+ .dsh-ellipsis2();
24
+ -webkit-line-clamp: 3;
25
+ word-break: break-word;
26
+ color: @contentColor;
27
+ }
28
+
29
+ &:hover {
30
+ background: @bgColor;
31
+ }
32
+
33
+ &-current {
34
+ font-weight: normal;
35
+ color: @themeColor;
36
+ }
37
+
38
+ &-disabled {
39
+ cursor: not-allowed;
40
+ }
25
41
  }
42
+
26
43
  &-collapseItem {
27
- padding: 6px 0px;
44
+ padding: 4px 0px;
28
45
  flex: 1;
46
+ display: flex;
47
+ justify-content: space-between;
48
+ cursor: pointer;
49
+
50
+ &:hover {
51
+ background: @bgColor;
52
+ }
29
53
  }
30
54
  }
31
55
 
32
56
  .BriCollapseTree {
33
57
  &-collapse {
34
58
  border: none;
59
+
35
60
  .ivu-collapse-item>.ivu-collapse-header {
36
61
  padding: 0px;
37
62
  height: auto;
@@ -39,6 +64,7 @@
39
64
  line-height: 18px;
40
65
  display: flex;
41
66
  align-items: center;
67
+
42
68
  i {
43
69
  margin-right: 0px;
44
70
  display: flex;
@@ -47,16 +73,19 @@
47
73
  width: 30px;
48
74
  height: 30px;
49
75
  }
76
+
50
77
  &:hover {
51
78
  background: @bgColor;
52
79
  }
53
80
  }
81
+
54
82
  .ivu-collapse-content {
55
83
  padding: 0px;
56
84
  }
85
+
57
86
  .ivu-collapse-content>.ivu-collapse-content-box {
58
87
  padding: 0px;
59
88
  padding-left: 18px;
60
89
  }
61
- }
90
+ }
62
91
  }