bri-components 1.5.5 → 1.5.7
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 +2 -2
- package/src/components/controls/mixins/cascaderMixin.js +1 -1
- package/src/components/controls/mixins/controlMixin.js +8 -4
- package/src/components/controls/mixins/dateMixin.js +2 -2
- package/src/components/controls/mixins/userAndDepartMixin.js +1 -1
- package/src/components/controls/senior/DshLabels.vue +1 -1
- package/src/components/form/DshDefaultSearch.vue +2 -0
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "bri-components",
|
|
3
|
-
"version": "1.5.
|
|
3
|
+
"version": "1.5.7",
|
|
4
4
|
"author": "dengshanghui",
|
|
5
5
|
"description": "a component lib for vue project",
|
|
6
6
|
"main": "src/index.js",
|
|
@@ -32,7 +32,7 @@
|
|
|
32
32
|
"dependencies": {
|
|
33
33
|
"ali-oss": "^6.13.1",
|
|
34
34
|
"axios": "^0.23.0",
|
|
35
|
-
"bri-datas": "^1.3.
|
|
35
|
+
"bri-datas": "^1.3.10",
|
|
36
36
|
"jshint": "^2.12.0",
|
|
37
37
|
"jsonlint": "^1.6.3",
|
|
38
38
|
"minio": "7.1.0",
|
|
@@ -33,7 +33,7 @@ export default {
|
|
|
33
33
|
...this.propsObj,
|
|
34
34
|
...this.commonDealPropsObj,
|
|
35
35
|
|
|
36
|
-
_changeOnSelect: this.
|
|
36
|
+
_changeOnSelect: this.isInAnySearch
|
|
37
37
|
? true
|
|
38
38
|
: this.propsObj._changeOnSelect == undefined ? false : this.propsObj._changeOnSelect, // 每级菜单都可取值 -默认取末级
|
|
39
39
|
_joinSymbol: _joinSymbol // 级联拼接符
|
|
@@ -114,7 +114,7 @@ export default {
|
|
|
114
114
|
_clearable: this.finalCanEdit && !this.propsObj._disabled && !this.propsObj._readonly && (this.propsObj._clearable === undefined ? true : this.propsObj._clearable),
|
|
115
115
|
_disabled: !(this.finalCanEdit && !this.propsObj._disabled && !this.propsObj._readonly),
|
|
116
116
|
// 目前部门、用户在用，以后还会增多
|
|
117
|
-
_useDeleteTip: this.
|
|
117
|
+
_useDeleteTip: this.isInAnySearch
|
|
118
118
|
? false
|
|
119
119
|
: this.propsObj._useDeleteTip == undefined
|
|
120
120
|
? false
|
|
@@ -123,7 +123,7 @@ export default {
|
|
|
123
123
|
},
|
|
124
124
|
// 是否为多选模式
|
|
125
125
|
multipleMode () {
|
|
126
|
-
return this.
|
|
126
|
+
return this.isInAnySearch
|
|
127
127
|
? true
|
|
128
128
|
: ["numberange", "daterange", "checkbox", "regions", "cascaders", "labels", "refCheckbox"].includes(this.controlType)
|
|
129
129
|
? true
|
|
@@ -188,14 +188,18 @@ export default {
|
|
|
188
188
|
isInRefDetail () {
|
|
189
189
|
return !!this.propsObj.inRefDetail;
|
|
190
190
|
},
|
|
191
|
-
//
|
|
191
|
+
// 在高级搜索下
|
|
192
192
|
isInSearch () {
|
|
193
193
|
return !!this.propsObj.inSearch;
|
|
194
194
|
},
|
|
195
|
-
//
|
|
195
|
+
// 在默认搜索下
|
|
196
196
|
isInDftSearch () {
|
|
197
197
|
return !!this.propsObj.inDftSearch;
|
|
198
198
|
},
|
|
199
|
+
// 在任何搜索下
|
|
200
|
+
isInAnySearch () {
|
|
201
|
+
return this.isInDftSearch || this.isInSearch;
|
|
202
|
+
},
|
|
199
203
|
isUnitUpdate () {
|
|
200
204
|
return this.isInTable && !!this.canEdit;
|
|
201
205
|
},
|
|
@@ -37,7 +37,7 @@ export default {
|
|
|
37
37
|
return this.selfPropsObj._dateType;
|
|
38
38
|
},
|
|
39
39
|
useDynDate () {
|
|
40
|
-
return this.
|
|
40
|
+
return this.isInAnySearch
|
|
41
41
|
? true
|
|
42
42
|
: this.selfPropsObj._useDynDate;
|
|
43
43
|
},
|
|
@@ -45,7 +45,7 @@ export default {
|
|
|
45
45
|
return this.selfPropsObj._dynDateType;
|
|
46
46
|
},
|
|
47
47
|
dynDateKeys () {
|
|
48
|
-
return this.
|
|
48
|
+
return this.isInAnySearch
|
|
49
49
|
? this.selfPropsObj._dynSearchKeys
|
|
50
50
|
: this.selfPropsObj._dynDateKeys;
|
|
51
51
|
},
|
|
@@ -169,7 +169,7 @@
|
|
|
169
169
|
return this.selfPropsObj._labelType;
|
|
170
170
|
},
|
|
171
171
|
onlySelect () {
|
|
172
|
-
return this.
|
|
172
|
+
return this.isInAnySearch ? true : this.selfPropsObj._onlySelect;
|
|
173
173
|
},
|
|
174
174
|
originLabels () {
|
|
175
175
|
return this.selfPropsObj._originLabels;
|