bri-components 1.3.77 → 1.3.79

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 (8) hide show
  1. package/package.json +1 -1
  2. package/src/components/controls/DshControlInput.vue +6 -2
  3. package/src/components/controls/base/DshDate/DshDaterange.vue +2 -8
  4. package/src/components/form/DshDefaultSearch.vue +28 -4
  5. package/src/components/list/DshFlatTable.vue +12 -0
  6. package/src/components/list/DshTreeTable.vue +12 -0
  7. package/src/components/list/mixins/DshFlatTableMixin.js +42 -2
  8. package/src/components/list/mixins/DshTreeTableMixin.js +1 -1
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "bri-components",
3
- "version": "1.3.77",
3
+ "version": "1.3.79",
4
4
  "author": "dengshanghui",
5
5
  "description": "a component lib for vue project",
6
6
  "main": "src/index.js",
package/src/components/controls/DshControlInput.vue CHANGED
@@ -155,8 +155,8 @@
155
155
  <style lang="less">
156
156
  .DshControlInput {
157
157
  .ivu-icon {
158
- padding: 2px 5px;
159
- color: @placeholder-disabled-color;
158
+ padding: 2px 7px 2px 3px;
159
+ color: #808695;
160
160
  }
161
161
 
162
162
  .ivu-tag-size-medium {
@@ -168,5 +168,9 @@
168
168
  padding: 0px;
169
169
  }
170
170
  }
171
+
172
+ &:hover {
173
+ border-color: #64c6d1;
174
+ }
171
175
  }
172
176
  </style>
package/src/components/controls/base/DshDate/DshDaterange.vue CHANGED
@@ -32,8 +32,7 @@
32
32
  <dsh-control-input
33
33
  :class="{
34
34
  ...commonClass,
35
- 'bri-control-nodata': this.$isEmptyData(this.showVal0),
36
- 'DshDaterange-item': true
35
+ 'bri-control-nodata': this.$isEmptyData(this.showVal0)
37
36
  }"
38
37
  :value="showVal0"
39
38
  :disabled="selfPropsObj._disabled"
@@ -61,8 +60,7 @@
61
60
  <dsh-control-input
62
61
  :class="{
63
62
  ...commonClass,
64
- 'bri-control-nodata': this.$isEmptyData(this.showVal1),
65
- 'DshDaterange-item': true
63
+ 'bri-control-nodata': this.$isEmptyData(this.showVal1)
66
64
  }"
67
65
  :value="showVal1"
68
66
  :disabled="selfPropsObj._disabled"
@@ -344,9 +342,5 @@
344
342
  text-align: center;
345
343
  color: @textColor;
346
344
  }
347
-
348
- &-item {
349
-
350
- }
351
345
  }
352
346
  </style>
package/src/components/form/DshDefaultSearch.vue CHANGED
@@ -219,12 +219,36 @@
219
219
  </style>
220
220
  <style lang="less">
221
221
  .DshDefaultSearch {
222
- input,
223
- .ivu-select-selection,
222
+ .ivu-input,
224
223
  .ivu-input-number,
225
- .DshControlInput,
226
- .DshDaterange-item {
224
+ .ivu-select-selection,
225
+ .DshControlInput {
227
226
  border-radius: 0px!important;
228
227
  }
228
+
229
+ /* 为了消除表格类型字段检验后，外层出现.ivu-form-item-error的class，对默认筛选的控件样式的影响 */
230
+ .ivu-input,
231
+ .ivu-input-number,
232
+ .ivu-select-selection,
233
+ .DshControlInput {
234
+ border-color: #E5E5E6;
235
+
236
+ &-focused,
237
+ &:focus {
238
+ border-color: #64c6d1;
239
+ box-shadow: 0 0 0 2px rgba(61, 184, 197, 0.2);
240
+ }
241
+ &:hover {
242
+ border-color: #64c6d1;
243
+ }
244
+ }
245
+ .ivu-select-visible .ivu-select-selection {
246
+ border-color: #64c6d1;
247
+ box-shadow: 0 0 0 2px rgba(61, 184, 197, 0.2);
248
+ }
249
+ .ivu-input-icon,
250
+ .ivu-select-arrow {
251
+ color: #808695;
252
+ }
229
253
  }
230
254
  </style>
package/src/components/list/DshFlatTable.vue CHANGED
@@ -11,6 +11,7 @@
11
11
 
12
12
  <!-- 表格 -->
13
13
  <bri-table
14
+ v-show="showListData.length"
14
15
  ref="briTable"
15
16
  class="DshFlatTable-main"
16
17
  :columns="showColumns"
@@ -20,6 +21,17 @@
20
21
  @changeSelect="changeSelect"
21
22
  @selectAll="changeSelect"
22
23
  ></bri-table>
24
+ <bri-table
25
+ v-show="!showListData.length"
26
+ ref="briTable"
27
+ class="DshFlatTable-main"
28
+ :columns="showColumns"
29
+ :data="showListData"
30
+ :footer-data="footerData"
31
+ :propsObj="tablePropsObj"
32
+ @changeSelect="changeSelect"
33
+ @selectAll="changeSelect"
34
+ ></bri-table>
23
35
 
24
36
  <!-- 添加行 -->
25
37
  <dsh-render :render="createOperationRender"></dsh-render>
package/src/components/list/DshTreeTable.vue CHANGED
@@ -11,6 +11,18 @@
11
11
 
12
12
  <!-- 表格 -->
13
13
  <bri-table
14
+ v-show="showListData.length"
15
+ ref="briTable"
16
+ class="DshTreeTable-main"
17
+ :columns="showColumns"
18
+ :data="renderedListData"
19
+ :footer-data="footerData"
20
+ :propsObj="tablePropsObj"
21
+ @changeSelect="changeSelect"
22
+ @selectAll="changeSelect"
23
+ ></bri-table>
24
+ <bri-table
25
+ v-show="!showListData.length"
14
26
  ref="briTable"
15
27
  class="DshTreeTable-main"
16
28
  :columns="showColumns"
package/src/components/list/mixins/DshFlatTableMixin.js CHANGED
@@ -71,7 +71,47 @@ export default {
71
71
  width: 76,
72
72
  align: "center",
73
73
  fixed: "left",
74
- renderBodyCell: ({ column, row, rowIndex }) => ++rowIndex
74
+ renderBodyCell: ({ row, column, rowIndex }, h) => {
75
+ return [
76
+ h("div", rowIndex + 1),
77
+
78
+ // 添加符
79
+ // this.operationMap.canCreate && !this.isSearching && rowIndex !== this.allListData.length - 1
80
+ this.operationMap.canCreate && !this.isSearching
81
+ ? h("div", {
82
+ style: {
83
+ position: "absolute",
84
+ bottom: "0px",
85
+ right: "0px",
86
+ display: "inline-block",
87
+ width: "16px",
88
+ height: " 16px",
89
+ border: "1px solid #dcdee2",
90
+ backgroundColor: "#ffffff",
91
+ lineHeight: "12px",
92
+ cursor: "pointer",
93
+ verticalAlign: "middle",
94
+ transition: "color .2s ease-in-out,border-color .2s ease-in-out"
95
+ }
96
+ }, [
97
+ h("Icon", {
98
+ style: {
99
+ fontWeight: "500"
100
+ },
101
+ props: {
102
+ type: "md-add-circle", // "ios-add"
103
+ size: "14"
104
+ },
105
+ on: {
106
+ click: () => {
107
+ this.clickCreate(this.operationMap.canCreate, row, rowIndex);
108
+ }
109
+ }
110
+ })
111
+ ])
112
+ : h("span", "")
113
+ ];
114
+ }
75
115
  };
76
116
  }
77
117
  },
@@ -90,7 +130,7 @@ export default {
90
130
  };
91
131
  const newRowIndex = rowIndex == null ? list.length : rowIndex + 1;
92
132
  list.splice(newRowIndex, 0, newRow);
93
- this.$forceUpdate(); // 自定义页中点击添加一行没有更新页面
133
+ // this.$forceUpdate(); // 自定义页中点击添加一行没有更新页面
94
134
 
95
135
  this.change("createRow", null, newRow, newRowIndex);
96
136
  },
package/src/components/list/mixins/DshTreeTableMixin.js CHANGED
@@ -161,7 +161,7 @@ export default {
161
161
  }, row.__treeIndex__),
162
162
 
163
163
  // 添加符
164
- this.operationMap.canCreate && row.level < this.maxLevel && !this.isSearching
164
+ this.operationMap.canCreate && !this.isSearching && row.level < this.maxLevel
165
165
  ? h("div", {
166
166
  style: {
167
167
  position: "absolute",