bri-components 1.2.64 → 1.2.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 CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "bri-components",
3
- "version": "1.2.64",
3
+ "version": "1.2.66",
4
4
  "author": "dengshanghui",
5
5
  "description": "a component lib for vue project",
6
6
  "main": "src/index.js",
@@ -50,7 +50,6 @@
50
50
  background-color: @themeColor;
51
51
  }
52
52
  }
53
-
54
53
  .ivu-checkbox-inner {
55
54
  background-color: @themeColor;
56
55
  }
@@ -65,22 +64,29 @@
65
64
  &-disabled {
66
65
  .ivu-@{control-type} {
67
66
  .ivu-@{control-type}-inner {
68
- border-color: #aaaaaa!important; // 为了useColor且disbaled时,压住下面each里的样式,这些还生效
67
+ border-color: #aaaaaa;
69
68
  }
70
69
 
71
70
  &-checked {
72
- .ivu-@{control-type}-inner {
73
- background-color: #E5E5E5!important; // 为了useColor且disbaled时,压住下面each里的样式,这些还生效
74
-
71
+ // 因为不一致,所以明确名字分开写
72
+ .ivu-radio-inner {
73
+ &::after {
74
+ background-color: #aaaaaa;
75
+ }
76
+ }
77
+ .ivu-checkbox-inner {
78
+ background-color: #aaaaaa;
79
+
80
+ // 对勾的颜色
75
81
  &::after {
76
- background-color: #aaaaaa!important; // 为了useColor且disbaled时,压住下面each里的样式,这些还生效
82
+ border-color: #f3f3f3;
77
83
  }
78
84
  }
79
85
  }
80
86
 
81
87
 
82
88
  & + span {
83
- color: #aaaaaa!important; // 为了useColor且disbaled时,压住下面each里的样式,这些还生效
89
+ color: #aaaaaa;
84
90
  }
85
91
  }
86
92
  }
@@ -149,11 +155,39 @@
149
155
  }
150
156
 
151
157
  &-disabled {
152
- border-color: #f3f3f3;
153
- background-color: #f3f3f3!important; // 压住style里的background-color
158
+ // opacity: 0.7;
159
+
160
+ .ivu-@{control-type} {
161
+ .ivu-@{control-type}-inner {
162
+ border-color: #cccccc;
163
+ }
164
+
165
+ &-checked {
166
+ // 因为不一致,所以明确名字分开写
167
+ .ivu-radio-inner {
168
+ &::after {
169
+ background-color: #cccccc;
170
+ }
171
+ }
172
+ .ivu-checkbox-inner {
173
+ background-color: #cccccc;
174
+
175
+ // 对勾的颜色
176
+ &::after {
177
+ border-color: #f3f3f3;
178
+ }
179
+ }
180
+ }
181
+
182
+
183
+ & + span {
184
+ color: @value;
185
+ opacity: 0.4;
186
+ }
187
+ }
154
188
 
155
189
  &.ivu-@{control-type}-wrapper-checked {
156
- border-color: #aaaaaa;
190
+ border-color: #cccccc;
157
191
  }
158
192
  }
159
193
  }
@@ -105,7 +105,7 @@
105
105
  v-else
106
106
  class="tree-nodata"
107
107
  >
108
- 暂无数据……
108
+ 暂无数据…
109
109
  </div>
110
110
  </div>
111
111
  </template>
@@ -85,8 +85,10 @@
85
85
 
86
86
  <div
87
87
  v-else
88
- class="dsh-tip"
89
- >{{ "--- 无字段 ---" }}</div>
88
+ class="DshForm-nodata"
89
+ >
90
+ {{ "--- 无字段 ---" }}
91
+ </div>
90
92
  </Row>
91
93
  </Form>
92
94
  </template>
@@ -400,6 +402,10 @@
400
402
  &-item-FormItem {
401
403
  margin-bottom: 0px;
402
404
  }
405
+
406
+ &-nodata {
407
+ #dsh-nodata();
408
+ }
403
409
  }
404
410
  </style>
405
411
  <style lang="less">
@@ -20,7 +20,7 @@
20
20
  v-else
21
21
  class="BriCard-nodata"
22
22
  >
23
- 暂无数据……
23
+ 暂无数据…
24
24
  </div>
25
25
  </div>
26
26
  </template>
@@ -59,7 +59,7 @@
59
59
  isLoading: Boolean,
60
60
  noDataText: {
61
61
  type: String,
62
- default: "暂无内容"
62
+ default: "暂无数据…"
63
63
  },
64
64
  columns: Array,
65
65
  data: Array,
@@ -13,7 +13,7 @@
13
13
  :propsObj="listPropsObj"
14
14
  :changedFields="changedFields"
15
15
  :isLoading="listPropsObj && listPropsObj.isLoading"
16
- :noDataText="listPropsObj && listPropsObj.noDataText || '暂无内容...'"
16
+ :noDataText="listPropsObj && listPropsObj.noDataText || '暂无数据…'"
17
17
  @clickRow="clickRow"
18
18
  @sortChange="changeSort"
19
19
  @changeSelect="changeSelect"