bri-components 1.2.4 → 1.2.6

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 (29) 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/2.bri-components.min.js +1 -1
  4. package/lib/3.bri-components.min.js +1 -1
  5. package/lib/4.bri-components.min.js +1 -1
  6. package/lib/5.bri-components.min.js +1 -1
  7. package/lib/6.bri-components.min.js +1 -1
  8. package/lib/bri-components.min.js +68 -6
  9. package/package.json +2 -1
  10. package/src/components/controls/base/BriUpload/uploadMixin.js +4 -3
  11. package/src/components/controls/base/DshCheckbox.vue +44 -39
  12. package/src/components/controls/base/DshCoordinates.vue +35 -22
  13. package/src/components/controls/base/DshDate.vue +2 -2
  14. package/src/components/controls/base/DshDaterange.vue +6 -0
  15. package/src/components/controls/base/DshEditor.vue +4 -4
  16. package/src/components/controls/base/DshInput.vue +26 -4
  17. package/src/components/controls/base/DshNumber/BriInputNumber/BriInputNumber.vue +27 -29
  18. package/src/components/controls/base/DshNumber/DshNumber.vue +15 -19
  19. package/src/components/controls/base/DshSelect.vue +146 -149
  20. package/src/components/controls/base/DshSwitch.vue +6 -5
  21. package/src/components/controls/controlMixin.js +4 -1
  22. package/src/components/controls/senior/selectDepartments.vue +60 -57
  23. package/src/components/controls/senior/selectUsers/selectUsers.vue +62 -66
  24. package/src/components/small/BriDrawer.vue +1 -1
  25. package/src/components/small/DshModal.vue +1 -1
  26. package/src/index.js +6 -0
  27. package/src/styles/components/controls/base/DshNumber.less +0 -8
  28. package/src/styles/components/controls/base/DshSelect.less +0 -19
  29. package/src/styles/components/small/DshDropdown.less +1 -1
package/src/components/controls/senior/selectUsers/selectUsers.vue CHANGED
@@ -6,67 +6,70 @@
6
6
  :transfer="true"
7
7
  maxWidth="200"
8
8
  >
9
- <!-- 编辑 -->
10
- <div
11
- v-if="canEdit"
12
- :class="{
13
- ...commonClass,
14
- 'selectUsers-edit': true
15
- }"
16
- @mouseenter="isHover = true"
17
- @mouseleave="isHover = false"
18
- @click="clickInput"
19
- >
20
- <!-- 有值 -->
21
- <template v-if="!$isEmptyData(curValList)">
22
- <dsh-tags
23
- class="text"
24
- :list="curValList"
25
- :propsObj="{
26
- disabled: !finalCanEdit,
27
- closable: true
9
+ <div @click.stop="clickInput">
10
+ <slot>
11
+ <!-- 编辑 -->
12
+ <div
13
+ v-if="canEdit"
14
+ :class="{
15
+ ...commonClass,
16
+ 'selectUsers-edit': true
28
17
  }"
29
- @delete="clickDeleteItem"
30
- ></dsh-tags>
31
- </template>
32
- <!-- 无值 -->
33
- <template v-else>
34
- {{ emptyShowVal }}
35
- </template>
18
+ @mouseenter="isHover = true"
19
+ @mouseleave="isHover = false"
20
+ >
21
+ <!-- 有值 -->
22
+ <template v-if="!$isEmptyData(curValList)">
23
+ <dsh-tags
24
+ class="text"
25
+ :list="curValList"
26
+ :propsObj="{
27
+ disabled: !finalCanEdit,
28
+ closable: true
29
+ }"
30
+ @delete="clickDeleteItem"
31
+ ></dsh-tags>
32
+ </template>
33
+ <!-- 无值 -->
34
+ <template v-else>
35
+ {{ emptyShowVal }}
36
+ </template>
36
37
 
37
- <!-- 图标 -->
38
- <template>
39
- <Icon
40
- v-if="!$isEmptyData(curValList) && selfPropsObj._clearable && isHover"
41
- class="icon-close"
42
- type="ios-close-circle"
43
- @click.stop="clickClear"
44
- />
45
- <Icon
46
- v-else
47
- class="icon-default"
48
- :type="inputIcon"
49
- />
50
- </template>
51
- </div>
38
+ <!-- 图标 -->
39
+ <template>
40
+ <Icon
41
+ v-if="!$isEmptyData(curValList) && selfPropsObj._clearable && isHover"
42
+ class="icon-close"
43
+ type="ios-close-circle"
44
+ @click.stop="clickClear"
45
+ />
46
+ <Icon
47
+ v-else
48
+ class="icon-default"
49
+ :type="inputIcon"
50
+ />
51
+ </template>
52
+ </div>
52
53
 
53
- <!-- 查看 -->
54
- <div
55
- v-else
56
- :class="{
57
- ...commonClass,
58
- 'selectUsers-show': true
59
- }"
60
- >
61
- <dsh-tags
62
- v-if="!$isEmptyData(curValList)"
63
- class="text"
64
- :list="curValList"
65
- ></dsh-tags>
54
+ <!-- 查看 -->
55
+ <div
56
+ v-else
57
+ :class="{
58
+ ...commonClass,
59
+ 'selectUsers-show': true
60
+ }"
61
+ >
62
+ <dsh-tags
63
+ v-if="!$isEmptyData(curValList)"
64
+ class="text"
65
+ :list="curValList"
66
+ ></dsh-tags>
66
67
 
67
- <template v-else>
68
- {{ emptyShowVal }}
69
- </template>
68
+ <template v-else>
69
+ {{ emptyShowVal }}
70
+ </template>
71
+ </div>
72
+ </slot>
70
73
  </div>
71
74
  </bri-tooltip>
72
75
 
@@ -213,9 +216,7 @@
213
216
  components: {
214
217
  departmentMenu
215
218
  },
216
- props: {
217
- showSelectUserModalOnly: Boolean
218
- },
219
+ props: {},
219
220
  data () {
220
221
  return {
221
222
  isHover: false,
@@ -392,6 +393,7 @@
392
393
  clickConfirm () {
393
394
  this.closeModal();
394
395
  this.curValList = this.newValList;
396
+ this.curDepartment = {};
395
397
  },
396
398
 
397
399
  /* ----------- 接口方法 ------------- */
@@ -456,12 +458,6 @@
456
458
  });
457
459
  }
458
460
  },
459
- watch: {
460
- showSelectUserModalOnly (nV, oV) {
461
- nV && this.init();
462
- nV && this.openModal();
463
- }
464
- },
465
461
  filters: {
466
462
  isActive (item, list) {
467
463
  return list.some(o => o._key === item._key) ? "selectUsers-list-item-active" : "";
package/src/components/small/BriDrawer.vue CHANGED
@@ -36,7 +36,7 @@
36
36
  v-if="selfPropsObj.closable"
37
37
  slot="close"
38
38
  class="BriDrawer-close"
39
- type="ios-close-circle"
39
+ type="md-close"
40
40
  size="20"
41
41
  @click.stop="clickClose"
42
42
  />
package/src/components/small/DshModal.vue CHANGED
@@ -41,7 +41,7 @@
41
41
  <Icon
42
42
  v-if="selfPropsObj.showSlotClose !== false"
43
43
  class="DshModal-close"
44
- type="ios-close-circle"
44
+ type="md-close"
45
45
  size="20"
46
46
  @click.native.stop="visibleChange(false)"
47
47
  />
package/src/index.js CHANGED
@@ -81,7 +81,11 @@ import BriUploadImage from "./components/controls/base/BriUpload/BriUploadImage.
81
81
  import DshCoordinates from "./components/controls/base/DshCoordinates.vue";
82
82
  import DshEditor from "./components/controls/base/DshEditor.vue";
83
83
  import DshDivider from "./components/controls/base/DshDivider.vue";
84
+
84
85
  import DshPackage from "./components/controls/senior/DshPackage.vue";
86
+ import selectUsers from "./components/controls/senior/selectUsers/selectUsers.vue";
87
+ import selectDepartments from "./components/controls/senior/selectDepartments.vue";
88
+
85
89
  import DshBack from "./components/controls/special/DshBack.vue";
86
90
  import DshUndeveloped from "./components/controls/special/DshUndeveloped.vue";
87
91
 
@@ -224,6 +228,8 @@ export {
224
228
  DshPackage,
225
229
  DshBack,
226
230
  DshUndeveloped,
231
+ selectUsers,
232
+ selectDepartments,
227
233
 
228
234
  // other
229
235
  BriCode,
package/src/styles/components/controls/base/DshNumber.less CHANGED
@@ -10,14 +10,6 @@
10
10
  color: @textColor;
11
11
  }
12
12
  }
13
-
14
- &-unit {
15
-
16
- }
17
-
18
- &-show {
19
-
20
- }
21
13
  }
22
14
 
23
15
  .ivu-input-number {
package/src/styles/components/controls/base/DshSelect.less CHANGED
@@ -135,25 +135,6 @@
135
135
  }
136
136
  }
137
137
 
138
- &-value {
139
- height: 24px;
140
- line-height: 20px;
141
- padding: 2px 8px;
142
- border-radius: 4px;
143
- margin-right: 8px;
144
- display: inline-flex;
145
-
146
- &:last-of-type {
147
- margin-right: 0px;
148
- }
149
-
150
- &-wrapper {
151
- min-height: 32px;
152
- padding: 4px 0;
153
- .dsh-ellipsis();
154
- }
155
- }
156
-
157
138
  &-tip {
158
139
  cursor: pointer;
159
140
 
package/src/styles/components/small/DshDropdown.less CHANGED
@@ -35,7 +35,7 @@
35
35
  color: @textColor-disabled
36
36
  }
37
37
  &-icon {
38
- margin-right: 3px;
38
+ margin-right: 8px;
39
39
  }
40
40
  &-name {
41
41