bri-components 1.1.1 → 1.1.2

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 (49) 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/7.bri-components.min.js +1 -1
  9. package/lib/8.bri-components.min.js +1 -1
  10. package/lib/9.bri-components.min.js +1 -1
  11. package/lib/bri-components.min.js +6 -6
  12. package/package.json +1 -1
  13. package/src/components/controls/base/BriLabels.vue +49 -13
  14. package/src/components/controls/base/DshCoordinates.vue +7 -4
  15. package/src/components/controls/base/DshEditor.vue +16 -5
  16. package/src/components/controls/base/DshInput.vue +7 -0
  17. package/src/components/controls/controlMap.js +2 -2
  18. package/src/components/controls/controlMixin.js +39 -25
  19. package/src/components/controls/senior/cascaderTable.vue +47 -41
  20. package/src/components/form/DshForm.vue +4 -17
  21. package/src/components/list/BriFlatTable.vue +4 -6
  22. package/src/components/list/BriTable.vue +10 -4
  23. package/src/components/list/DshBox/DshSingleData.vue +0 -7
  24. package/src/components/list/DshCascaderTable.vue +3 -4
  25. package/src/components/list/ZTree.vue +1 -1
  26. package/src/components/other/ZLoading.vue +32 -3
  27. package/src/components/small/BriDrawer.vue +132 -0
  28. package/src/components/small/DshButtons.vue +3 -3
  29. package/src/components/small/DshModal.vue +25 -1
  30. package/src/components/unit/DshFormItem.vue +40 -41
  31. package/src/components/unit/DshUnit.vue +15 -8
  32. package/src/components/unit/unitMixin.js +0 -8
  33. package/src/index.js +7 -4
  34. package/src/styles/common/box.less +29 -0
  35. package/src/styles/common/control.less +1 -0
  36. package/src/styles/components/controls/BriLabels.less +32 -18
  37. package/src/styles/components/controls/DshCascader.less +7 -3
  38. package/src/styles/components/controls/DshLabels.less +3 -3
  39. package/src/styles/components/index.less +1 -1
  40. package/src/styles/components/other/InfoCascader.less +4 -0
  41. package/src/styles/components/other/ZLoading.less +23 -7
  42. package/src/styles/components/small/BriDrawer.less +34 -0
  43. package/src/styles/components/small/DshControlDefine.less +2 -1
  44. package/src/styles/components/small/DshDropdown.less +11 -8
  45. package/src/styles/components/small/DshTitle.less +1 -1
  46. package/src/styles/components/unit/DshFormItem.less +6 -4
  47. package/src/styles/plugin/iview.less +7 -3
  48. package/src/styles/reset.less +2 -2
  49. package/src/utils/table.js +3 -4
@@ -109,17 +109,17 @@
109
109
  }
110
110
  }
111
111
 
112
- &-tag{
112
+ &-tag {
113
113
  width: fit-content;
114
114
  margin-right: 10px;
115
115
  }
116
116
 
117
- &-nodata{
117
+ &-nodata {
118
118
  color: @textColor;
119
119
  }
120
120
  }
121
121
 
122
- &-searchResult{
122
+ &-searchResult {
123
123
  position: fixed;
124
124
  z-index: 333;
125
125
  max-height: 150px;
@@ -53,7 +53,7 @@
53
53
  @import "./small/DshSteps.less";
54
54
  @import "./small/DshControlDefine.less";
55
55
  @import "./small/BriButton.less";
56
- @import "./small/BriTree.less";
56
+ @import "./small/BriDrawer.less";
57
57
 
58
58
  // unit
59
59
  @import "./unit/DshFormItem.less";
@@ -52,4 +52,8 @@
52
52
  padding-right: 16px;
53
53
  }
54
54
  }
55
+
56
+ .ivu-tree-empty {
57
+ text-align: center;
58
+ }
55
59
  }
@@ -19,18 +19,34 @@
19
19
  width: 100%;
20
20
  height: 100%;
21
21
 
22
+ @keyframes spin {
23
+ from { transform: rotate(0deg); }
24
+ to { transform: rotate(360deg); }
25
+ }
26
+
22
27
  .ZLoading-main {
23
28
  width: 100%;
24
29
  height: 100%;
25
-
26
- img {
27
- width: auto;
28
- height: auto;
29
- max-width: 100%;
30
- max-height: 100%;
30
+ .dsh-flex();
31
+
32
+ &-content {
33
+ display: flex;
34
+ flex-direction: column;
35
+ align-items: center;
31
36
  }
32
37
 
33
- .dsh-flex();
38
+ &-loading {
39
+ border-radius: 50%;
40
+ background: conic-gradient(#5EC4CF 50%, white);
41
+ --mask: radial-gradient(closest-side, transparent 70%, black 71%);
42
+ -webkit-mask-image: var(--mask);
43
+ mask-image: var(--mask);
44
+ animation: spin 1s linear infinite;
45
+ }
46
+ &-loadingText {
47
+ margin-top: 8px;
48
+ color: @themeColor;
49
+ }
34
50
  }
35
51
  }
36
52
  }
@@ -0,0 +1,34 @@
1
+ .BriDrawer {
2
+ .ivu-drawer-header {
3
+ padding: 16px 16px 15px;
4
+ }
5
+ .ivu-drawer-body {
6
+ padding: 0px;
7
+ }
8
+ .ivu-drawer-close {
9
+ top: 18px;
10
+ right: 18px
11
+ }
12
+ &-header {
13
+ color: @textColor;
14
+ font-weight: 500;
15
+ font-size: @smallTitleSize;
16
+ line-height: @smallTitleHeight;
17
+ }
18
+ &-close {
19
+ color: @contentColor;
20
+ }
21
+ &-main {
22
+ height: 100%;
23
+ display: flex;
24
+ flex-direction: column;
25
+ }
26
+ &-body {
27
+ flex: 1;
28
+ overflow: auto;
29
+ }
30
+ &-footer {
31
+ border-top: 1px solid @borderColor;
32
+ padding: 11px 16px 12px;
33
+ }
34
+ }
@@ -35,8 +35,9 @@
35
35
  white-space: nowrap;
36
36
  }
37
37
  }
38
-
38
+
39
39
  &-nodata {
40
40
  .control-notext();
41
+ padding: 0 7px;
41
42
  }
42
43
  }
@@ -1,6 +1,6 @@
1
1
  .DshDropdown {
2
2
  &-rel {
3
- color: #aaaaaa!important;
3
+ color: @contentColor;
4
4
  cursor: pointer;
5
5
  }
6
6
 
@@ -18,21 +18,19 @@
18
18
  overflow: auto;
19
19
 
20
20
  .list {
21
- .item {
22
- padding: 7px 16px 5px 10px;
23
- color: #979797;
21
+ .list-item {
24
22
  display: flex;
25
23
  flex-direction: row;
26
24
  align-items: center;
27
-
25
+ border-radius: @borderRadius;
26
+ padding: 9px 8px;
28
27
  &:hover {
29
- background-color: #FFF;
28
+ background-color: @theme-focus;
30
29
  color: @themeColor;
31
30
  }
32
31
 
33
32
  &-disabled {
34
- background-color: #f5f5f5!important;
35
- color: #979797!important;
33
+ color: @textColor-disabled
36
34
  }
37
35
  &-icon {
38
36
  margin-right: 3px;
@@ -58,4 +56,9 @@
58
56
  }
59
57
  }
60
58
  }
59
+ }
60
+ .ivu-select-dropdown {
61
+ border: 0.5px solid rgba(229,229,229,1);
62
+ box-shadow: 0 3px 14px 2px rgba(0,0,0,0.05), 0 8px 10px 1px rgba(0,0,0,0.06), 0 5px 5px -3px rgba(0,0,0,0.1);
63
+ padding: 8px;
61
64
  }
@@ -4,7 +4,7 @@
4
4
  align-items: center;
5
5
  cursor: pointer;
6
6
  &-name {
7
- margin-left: 10px;
7
+ margin-left: 8px;
8
8
  font-size: @smallTitleSize;
9
9
  }
10
10
  }
@@ -41,9 +41,13 @@
41
41
  }
42
42
 
43
43
  &-name {
44
- color: @contentColor;
45
44
  font-size: @textSize;
46
-
45
+ &-edit {
46
+ color: @textColor;
47
+ }
48
+ &-show {
49
+ color: @contentColor
50
+ }
47
51
  &-sign {
48
52
  #dsh-sign-change();
49
53
  }
@@ -115,8 +119,6 @@
115
119
  }
116
120
  }
117
121
 
118
-
119
-
120
122
  .ivu-tooltip {
121
123
  display: flex;
122
124
  }
@@ -5,9 +5,14 @@
5
5
  @primary-color : #3DB8C5; // @themeColor;
6
6
  @text-color : rgba(0, 0, 0, 0.9);
7
7
  @border-radius-base : 4px;
8
+ @border-color-split : #E5E5E5;
8
9
  @border-color-base : #E5E5E5;
9
10
  @background-color-base : #F5F5F5;
10
11
  @font-family : "PingFang SC","Microsoft YaHei","微软雅黑";
12
+ @processing-color : @primary-color;
13
+ @normal-color : red;
14
+ @link-color : #3DB8C5;
15
+ @info-color : #2db7f5;
11
16
 
12
17
  // Button
13
18
  @btn-primary-color : rgba(255, 255,255, 0.9);
@@ -23,12 +28,11 @@
23
28
 
24
29
  // input
25
30
  @input-placeholder-color: rgba(0, 0, 0, 0.4);
26
- @input-disabled-bg : #E5E5E5
27
-
31
+ @input-disabled-bg : #E5E5E5;
28
32
  // @btn-padding-base-icon : 5px 15px 6px;
29
33
  // @btn-padding-large-icon : 6px 15px 6px 15px;
30
34
  // @btn-padding-small-icon : 1px 7px 2px;
31
35
  // @btn-padding-base : 0 @padding-md - 1px;
32
36
  // @btn-padding-large : @btn-padding-base;
33
37
  // @btn-padding-small : 0 @padding-xs - 1px;
34
-
38
+
@@ -12,8 +12,8 @@ html {
12
12
  "Helvetica Neue", "PingFang SC", "Noto Sans", "Noto Sans CJK SC",
13
13
  "Microsoft YaHei",
14
14
  sans-serif; */
15
- font-family: SourceHanSansCN-Heavy, SourceHanSansCN;
16
- font-size: 12px;
15
+ font-family: PingFang SC, Microsoft YaHei, 微软雅黑;
16
+ font-size: 14px;
17
17
  // color: @textColor;
18
18
  }
19
19
 
@@ -36,11 +36,10 @@ const transformToColumns = function (form) {
36
36
  renderBodyCell: ({ row, column, rowIndex }, h) => {
37
37
  return h("dsh-unit", {
38
38
  props: {
39
- formData: row,
40
- formItem: col,
39
+ isUnit: true,
41
40
  rowIndex: rowIndex,
42
- canEdit: false,
43
- isUnit: true
41
+ formData: row,
42
+ formItem: col
44
43
  }
45
44
  });
46
45
  }