bri-components 1.2.13 → 1.2.14

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 (9) hide show
  1. package/lib/1.bri-components.min.js +1 -1
  2. package/lib/bri-components.min.js +2 -2
  3. package/package.json +2 -2
  4. package/src/components/controls/base/BriUpload/uploadMixin.js +16 -1
  5. package/src/components/controls/senior/cascaderTable.vue +10 -9
  6. package/src/components/unit/DshFormItem.vue +3 -1
  7. package/src/styles/components/controls/base/DshCascader/DshCascader.less +7 -12
  8. package/src/styles/components/controls/base/DshCheckbox.less +43 -48
  9. package/src/styles/components/controls/base/DshSelect.less +70 -72
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "bri-components",
3
- "version": "1.2.13",
3
+ "version": "1.2.14",
4
4
  "author": "dengshanghui",
5
5
  "description": "a component lib for vue project",
6
6
  "main": "src/index.js",
@@ -36,7 +36,7 @@
36
36
  "jshint": "^2.12.0",
37
37
  "minio": "^7.0.26",
38
38
  "stream": "^0.0.2",
39
- "view-design": "4.6.0",
39
+ "view-design": "^4.6.0",
40
40
  "viewerjs": "^1.10.2",
41
41
  "vue-codemirror": "^4.0.6",
42
42
  "vue-cropperjs": "^4.1.0",
package/src/components/controls/base/BriUpload/uploadMixin.js CHANGED
@@ -144,7 +144,22 @@ export default {
144
144
  callbackBodyType: "application/json",
145
145
  callbackBody: this.transferCallBody(callbackBody)
146
146
  };
147
- new Oss(res.ossConfig).multipartUpload(remoteName, file, {
147
+
148
+ let newOss = {
149
+ ...res.ossConfig,
150
+ refreshSTSToken: async () => {
151
+ // 向您搭建的STS服务获取临时访问凭证。
152
+ return {
153
+ accessKeyId: res.ossConfig.accessKeyId, // 自己账户的accessKeyId或临时秘钥
154
+ accessKeySecret: res.ossConfig.accessKeySecret, // 自己账户的accessKeySecret或临时秘钥
155
+ stsToken: res.ossConfig.stsToken // 从STS服务获取的安全令牌（SecurityToken）。
156
+ };
157
+ },
158
+ // 刷新临时访问凭证的时间间隔，单位为毫秒。
159
+ refreshSTSTokenInterval: 3600 * 1000
160
+ };
161
+
162
+ new Oss(newOss).multipartUpload(remoteName, file, {
148
163
  progress: (percentage) => {
149
164
  this.inProgress(Number((percentage * 100).toFixed(0)));
150
165
  this.handleProgress && this.handleProgress(percentage, file);
package/src/components/controls/senior/cascaderTable.vue CHANGED
@@ -5,9 +5,9 @@
5
5
  v-if="isUnitShow"
6
6
  class="cascaderTable-unit"
7
7
  >
8
- <dsh-icons :list="$getOperationList(['link'])"></dsh-icons>
8
+ <dsh-icons :list="$getOperationList(['canLink'])"></dsh-icons>
9
9
  <span class="cascaderTable-unit-text">
10
- {{ value[controlKey] && value[controlKey].tree.length || 0 }}行
10
+ {{ curVal && curVal.tree.length }}行
11
11
  </span>
12
12
  </span>
13
13
 
@@ -18,7 +18,7 @@
18
18
  :canEdit="finalCanEdit"
19
19
  :treeColumns="treeColumns"
20
20
  :subColumns="subColumns"
21
- :data="value[controlKey]"
21
+ :data="curVal"
22
22
  :propsObj="propsObj"
23
23
  @change="change"
24
24
  ></dsh-cascader-table>
@@ -39,7 +39,7 @@
39
39
  :canEdit="finalCanEdit"
40
40
  :treeColumns="treeColumns"
41
41
  :subColumns="subColumns"
42
- :data="value[controlKey]"
42
+ :data="curVal"
43
43
  :propsObj="propsObj"
44
44
  @change="change"
45
45
  ></dsh-cascader-table>
@@ -51,12 +51,12 @@
51
51
  :propsObj="modalPropsObj"
52
52
  >
53
53
  <dsh-cascader-table
54
- v-if="value[controlKey] && isEnlarge"
54
+ v-if="curVal && isEnlarge"
55
55
  useCol
56
56
  :canEdit="finalCanEdit"
57
57
  :treeColumns="treeColumns"
58
58
  :subColumns="subColumns"
59
- :data="value[controlKey]"
59
+ :data="curVal"
60
60
  :propsObj="propsObj"
61
61
  @change="change"
62
62
  ></dsh-cascader-table>
@@ -97,16 +97,17 @@
97
97
  btnType: "text",
98
98
  event: "clickEnlarge"
99
99
  },
100
- link: {
100
+ canLink: {
101
101
  customIcon: "bico-Cascadetable"
102
102
  }
103
103
  }
104
104
  };
105
105
  },
106
106
  computed: {
107
+ // 用户态的每条数据的表头配置，都是存的自己的，不用通用配置_treeForm的
107
108
  treeColumns () {
108
- return this.value[this.controlKey] && this.value[this.controlKey]._treeForm
109
- ? this.value[this.controlKey]._treeForm
109
+ return this.curVal && this.curVal._treeForm
110
+ ? this.curVal._treeForm
110
111
  : this.propsObj._treeForm;
111
112
  },
112
113
  subColumns () {
package/src/components/unit/DshFormItem.vue CHANGED
@@ -137,7 +137,9 @@
137
137
  formControlClass: String
138
138
  },
139
139
  data () {
140
- return {};
140
+ return {
141
+ showTipModal: false // tipsRender使用，不可删除
142
+ };
141
143
  },
142
144
  computed: {},
143
145
  created () {},
package/src/styles/components/controls/base/DshCascader/DshCascader.less CHANGED
@@ -2,19 +2,19 @@
2
2
  width: 100%;
3
3
 
4
4
  &-edit {
5
+
5
6
  // 多选
6
7
  &-multiple {
7
8
  width: 100%;
8
-
9
- &-edit {
10
9
 
11
- }
10
+ &-edit {}
12
11
  }
13
12
 
14
13
  // 单选 -新模式
15
14
  &-custom {
16
15
  width: 100%;
17
16
  }
17
+
18
18
  // 单选 -默认模式
19
19
  &-single {
20
20
  width: 100%;
@@ -23,22 +23,18 @@
23
23
 
24
24
  // 查看
25
25
  &-show {
26
- &-multiple {
27
-
28
- }
26
+ &-multiple {}
29
27
 
30
- &-single {
31
-
32
- }
28
+ &-single {}
33
29
  }
34
30
 
35
31
  // 多选类型且独自一行时
36
32
  &-row {
37
- &-edit {
33
+ &-edit {}
38
34
 
39
- }
40
35
  &-show {
41
36
  height: auto;
37
+
42
38
  .text,
43
39
  .overflow {
44
40
  width: 100%;
@@ -66,7 +62,6 @@
66
62
  .ivu-cascader-menu {
67
63
  max-height: 400px;
68
64
  height: auto;
69
- max-width: 300px;
70
65
  }
71
66
  }
72
67
  }
package/src/styles/components/controls/base/DshCheckbox.less CHANGED
@@ -11,7 +11,6 @@
11
11
 
12
12
  &-color {
13
13
  .ivu-checkbox-border {
14
- margin-bottom: 5px;
15
14
  margin-right: 16px;
16
15
  height: 32px;
17
16
  border: none;
@@ -50,71 +49,67 @@
50
49
  }
51
50
  }
52
51
  });
53
- }
52
+ }
54
53
 
55
- &-disabled {
56
- .ivu-checkbox-disabled+span {
57
- color: #515a6e;
58
- }
54
+ &-disabled {
55
+ .ivu-checkbox-disabled+span {
56
+ color: #515a6e;
59
57
  }
58
+ }
60
59
 
61
- &-scroll {
62
- overflow-x: auto;
63
- overflow-y: hidden;
64
- white-space: nowrap;
60
+ &-scroll {
61
+ overflow-x: auto;
62
+ overflow-y: hidden;
63
+ white-space: nowrap;
65
64
 
66
- &::-webkit-scrollbar {
67
- height: 6px;
68
- }
65
+ &::-webkit-scrollbar {
66
+ height: 6px;
67
+ }
69
68
 
70
- &:-webkit-scrollbar-thumb {
71
- border-radius: 3px;
72
- background: rgba(51, 51, 51, .1);
73
- background-clip: border-box;
74
- }
69
+ &:-webkit-scrollbar-thumb {
70
+ border-radius: 3px;
71
+ background: rgba(51, 51, 51, .1);
72
+ background-clip: border-box;
75
73
  }
76
74
  }
75
+ }
77
76
 
78
- &-item {
79
-
80
- }
77
+ &-item {}
81
78
 
82
- &-show {
79
+ &-show {}
83
80
 
84
- }
81
+ .ivu-select-multiple {
82
+ .ivu-select-selection {
83
+ height: 32px;
84
+ .dsh-flex-row-between-center();
85
85
 
86
- .ivu-select-multiple {
87
- .ivu-select-selection {
88
- height: 32px;
89
- .dsh-flex-row-between-center();
90
-
91
- & > div {
92
- width: 100%;
93
- height: 100%;
94
- word-break: keep-all;
95
- white-space: nowrap;
96
- overflow: auto;
97
- .bri-scrollbar3();
86
+ &>div {
87
+ width: 100%;
88
+ height: 100%;
89
+ word-break: keep-all;
90
+ white-space: nowrap;
91
+ overflow: auto;
92
+ .bri-scrollbar3();
98
93
 
99
- .ivu-tag {
100
- margin: 2px 4px 0px 0px;
101
- background-color: @borderColor;
102
- }
94
+ .ivu-tag {
95
+ margin: 2px 4px 0px 0px;
96
+ background-color: @borderColor;
103
97
  }
104
98
  }
99
+ }
105
100
 
106
- &.ivu-select-disabled {
107
- .ivu-select-selection {
108
- & > div {
109
- .ivu-tag {
110
- background-color: @border-disabled;
111
- }
101
+ &.ivu-select-disabled {
102
+ .ivu-select-selection {
103
+ &>div {
104
+ .ivu-tag {
105
+ background-color: @border-disabled;
112
106
  }
113
107
  }
114
108
  }
109
+ }
115
110
 
116
- .ivu-select-item-selected:after {
117
- content: none;
118
- }
111
+ .ivu-select-item-selected:after {
112
+ content: none;
119
113
  }
114
+ }
120
115
  }
package/src/styles/components/controls/base/DshSelect.less CHANGED
@@ -11,7 +11,6 @@
11
11
  border-radius: 4px;
12
12
  border: none;
13
13
  color: #FFF;
14
- margin-bottom: 5px;
15
14
  margin-right: 16px;
16
15
  }
17
16
 
@@ -47,104 +46,102 @@
47
46
  }
48
47
 
49
48
  each(@resourceColor, {
50
- .color-@{index} {
51
- .ivu-radio {
52
- .ivu-radio-inner {
53
- border-color: @value;
54
- }
49
+ .color-@{index} {
50
+ .ivu-radio {
51
+ .ivu-radio-inner {
52
+ border-color: @value;
55
53
  }
54
+ }
56
55
 
57
- .ivu-radio-checked {
58
- .ivu-radio-inner {
59
- &::after {
60
- background-color: @value;
61
- }
56
+ .ivu-radio-checked {
57
+ .ivu-radio-inner {
58
+ &::after {
59
+ background-color: @value;
62
60
  }
63
61
  }
64
62
  }
65
63
  }
64
+ });
65
+ }
66
66
 
67
- );
68
- }
69
-
70
- &-scroll {
71
- overflow-x: auto;
72
- overflow-y: hidden;
73
- white-space: nowrap;
67
+ &-scroll {
68
+ overflow-x: auto;
69
+ overflow-y: hidden;
70
+ white-space: nowrap;
74
71
 
75
- &::-webkit-scrollbar {
76
- height: 6px;
77
- }
72
+ &::-webkit-scrollbar {
73
+ height: 6px;
74
+ }
78
75
 
79
- &:-webkit-scrollbar-thumb {
80
- border-radius: 3px;
81
- background: rgba(51, 51, 51, .1);
82
- background-clip: border-box;
83
- }
76
+ &:-webkit-scrollbar-thumb {
77
+ border-radius: 3px;
78
+ background: rgba(51, 51, 51, .1);
79
+ background-clip: border-box;
84
80
  }
85
81
  }
82
+ }
86
83
 
87
- &-modal {
88
- .ivu-modal-wrap {
89
- display: flex;
90
- align-items: center;
91
- justify-content: center;
92
- }
84
+ &-modal {
85
+ .ivu-modal-wrap {
86
+ display: flex;
87
+ align-items: center;
88
+ justify-content: center;
89
+ }
93
90
 
94
- .ivu-modal {
95
- width: 544px !important;
96
- position: static;
97
- }
91
+ .ivu-modal {
92
+ width: 544px !important;
93
+ position: static;
94
+ }
98
95
 
99
- .ivu-modal-content {
100
- border-radius: 8px;
101
- }
96
+ .ivu-modal-content {
97
+ border-radius: 8px;
98
+ }
102
99
 
103
- .ivu-modal-header {
104
- border-bottom: none;
105
- padding: 32px 32px 0;
100
+ .ivu-modal-header {
101
+ border-bottom: none;
102
+ padding: 32px 32px 0;
106
103
 
107
- .ivu-modal-header-inner {
108
- font-size: 18px;
109
- font-family: Microsoft YaHei-Semibold, Microsoft YaHei;
110
- font-weight: 600;
111
- color: #252F36;
112
- }
104
+ .ivu-modal-header-inner {
105
+ font-size: 18px;
106
+ font-family: Microsoft YaHei-Semibold, Microsoft YaHei;
107
+ font-weight: 600;
108
+ color: #252F36;
113
109
  }
110
+ }
114
111
 
115
112
 
116
- .DshModal-close {
117
- right: 30px !important;
118
- top: 30px !important;
119
- background: #F4F6F8;
120
- border-radius: 4px 4px 4px 4px;
121
- }
113
+ .DshModal-close {
114
+ right: 30px !important;
115
+ top: 30px !important;
116
+ background: #F4F6F8;
117
+ border-radius: 4px 4px 4px 4px;
118
+ }
122
119
 
123
- .ivu-modal-body {
124
- padding: 24px 32px 32px;
125
- }
120
+ .ivu-modal-body {
121
+ padding: 24px 32px 32px;
122
+ }
126
123
 
127
- &-footer {
128
- margin-top: 24px;
129
- text-align: right;
124
+ &-footer {
125
+ margin-top: 24px;
126
+ text-align: right;
130
127
 
131
- .ivu-btn {
132
- font-size: 16px;
133
- font-family: Microsoft YaHei-Semibold, Microsoft YaHei;
134
- font-weight: 600;
135
- border-radius: 4px;
136
- }
128
+ .ivu-btn {
129
+ font-size: 16px;
130
+ font-family: Microsoft YaHei-Semibold, Microsoft YaHei;
131
+ font-weight: 600;
132
+ border-radius: 4px;
137
133
  }
138
134
  }
135
+ }
139
136
 
140
- &-tip {
141
- cursor: pointer;
137
+ &-tip {
138
+ cursor: pointer;
142
139
 
143
- .ivu-radio {
144
- display: none;
145
- }
140
+ .ivu-radio {
141
+ display: none;
146
142
  }
147
143
  }
144
+ }
148
145
 
149
146
  .ivu-select {
150
147
  .ivu-select-selection {
@@ -155,11 +152,12 @@
155
152
  .ivu-select-disabled {
156
153
  .ivu-select-selection {
157
154
  .bri-control-disabled();
158
-
155
+
159
156
  &:hover {
160
157
  border-color: @border-disabled;
161
158
  }
162
159
  }
160
+
163
161
  .ivu-select-input[disabled] {
164
162
  color: @textColor;
165
163
  -webkit-text-fill-color: @textColor;