bri-components 1.4.36 → 1.4.38
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 +1 -1
- package/src/components/controls/DshControlInput.vue +2 -1
- package/src/components/controls/base/DshCascader/components/cascaderPicker.vue +2 -1
- package/src/components/controls/mixins/cascaderMixin.js +1 -1
- package/src/components/controls/mixins/controlMixin.js +6 -6
- package/src/components/controls/mixins/userAndDepartMixin.js +2 -1
- package/src/components/controls/senior/BriLabels.vue +1 -1
- package/src/components/form/DshDefaultSearch.vue +1 -1
- package/src/components/form/searchMixin.js +1 -1
- package/src/components/list/mixins/DshCascaderTableMixin.js +6 -5
- package/src/components/small/DshTags.vue +18 -4
package/package.json
CHANGED
|
@@ -359,12 +359,13 @@
|
|
|
359
359
|
&-list {
|
|
360
360
|
width: 100%;
|
|
361
361
|
min-height: 280px;
|
|
362
|
-
max-height:
|
|
362
|
+
max-height: 360px;
|
|
363
363
|
padding: 5px 10px 10px;
|
|
364
364
|
overflow: auto;
|
|
365
365
|
|
|
366
366
|
&-menu {
|
|
367
367
|
.item {
|
|
368
|
+
margin: 2px 0px;
|
|
368
369
|
padding: 8px 10px;
|
|
369
370
|
border-radius: @borderRadius;
|
|
370
371
|
line-height: 16px;
|
|
@@ -33,7 +33,7 @@ export default {
|
|
|
33
33
|
...this.propsObj,
|
|
34
34
|
...this.commonDealPropsObj,
|
|
35
35
|
|
|
36
|
-
_changeOnSelect: this.
|
|
36
|
+
_changeOnSelect: this.isInSearch
|
|
37
37
|
? true
|
|
38
38
|
: this.propsObj._changeOnSelect == undefined ? false : this.propsObj._changeOnSelect, // 每级菜单都可取值 -默认取末级
|
|
39
39
|
_joinSymbol: _joinSymbol // 级联拼接符
|
|
@@ -110,12 +110,12 @@ export default {
|
|
|
110
110
|
? (this.propsObj._placeholder || `${selectControlTypes.includes(this.controlType) ? "选择" : "输入"}${this.propsObj._name}`)
|
|
111
111
|
: "",
|
|
112
112
|
_clearable: this.finalCanEdit && !this.propsObj._disabled && !this.propsObj._readonly && (this.propsObj._clearable === undefined ? true : this.propsObj._clearable),
|
|
113
|
-
_disabled: !this.finalCanEdit
|
|
113
|
+
_disabled: !(this.finalCanEdit && !this.propsObj._disabled && !this.propsObj._readonly)
|
|
114
114
|
};
|
|
115
115
|
},
|
|
116
116
|
// 是否为多选模式
|
|
117
117
|
multipleMode () {
|
|
118
|
-
return this.
|
|
118
|
+
return this.isInDftSearch || this.isInSearch
|
|
119
119
|
? true
|
|
120
120
|
: ["checkbox", "regions", "cascaders", "labels", "refCheckbox"].includes(this.controlType)
|
|
121
121
|
? true
|
|
@@ -191,12 +191,12 @@ export default {
|
|
|
191
191
|
return !!this.propsObj.inRefDetail;
|
|
192
192
|
},
|
|
193
193
|
// 高级搜索状态
|
|
194
|
-
|
|
195
|
-
return !!this.propsObj.
|
|
194
|
+
isInSearch () {
|
|
195
|
+
return !!this.propsObj.inSearch;
|
|
196
196
|
},
|
|
197
197
|
// 默认搜索状态
|
|
198
|
-
|
|
199
|
-
return !!this.propsObj.
|
|
198
|
+
isInDftSearch () {
|
|
199
|
+
return !!this.propsObj.inDftSearch;
|
|
200
200
|
},
|
|
201
201
|
isUnitUpdate () {
|
|
202
202
|
return this.isInTable && !!this.canEdit;
|
|
@@ -53,6 +53,7 @@ export default {
|
|
|
53
53
|
return {
|
|
54
54
|
_highSearch: false,
|
|
55
55
|
_searchString: "",
|
|
56
|
+
_useDeleteTip: false, // 删除项进行提示
|
|
56
57
|
|
|
57
58
|
_reverseFilter: false, // 反向过滤
|
|
58
59
|
_userDepartFilterVals: [], // 过滤的数据的第一级选项
|
|
@@ -65,7 +66,7 @@ export default {
|
|
|
65
66
|
},
|
|
66
67
|
|
|
67
68
|
highSearch () {
|
|
68
|
-
return this.
|
|
69
|
+
return this.isInSearch ? true : this.selfPropsObj._highSearch;
|
|
69
70
|
},
|
|
70
71
|
searchString () {
|
|
71
72
|
return this.selfPropsObj._searchString;
|
|
@@ -147,7 +147,7 @@
|
|
|
147
147
|
return this.selfPropsObj._labelType;
|
|
148
148
|
},
|
|
149
149
|
onlySelect () {
|
|
150
|
-
return this.
|
|
150
|
+
return this.isInSearch ? true : this.selfPropsObj._onlySelect;
|
|
151
151
|
},
|
|
152
152
|
originLabels () {
|
|
153
153
|
return this.selfPropsObj._originLabels;
|
|
@@ -381,11 +381,12 @@ export default {
|
|
|
381
381
|
rowItem.children = [];
|
|
382
382
|
rowItem.isLeaf = true;
|
|
383
383
|
|
|
384
|
-
// TODO：特殊处理-叶子节点上注入对应表头列们的name值
|
|
385
|
-
const treeNodes = [...parentNodes, rowItem];
|
|
386
|
-
treeForm.forEach((treeFormItem, treeFormIndex) => {
|
|
387
|
-
|
|
388
|
-
|
|
384
|
+
// // TODO：特殊处理-叶子节点上注入对应表头列们的name值
|
|
385
|
+
// const treeNodes = [...parentNodes, rowItem];
|
|
386
|
+
// treeForm.forEach((treeFormItem, treeFormIndex) => {
|
|
387
|
+
// rowItem[treeFormItem._key] = treeNodes[treeFormIndex].name;
|
|
388
|
+
// // this.$set(rowItem, treeFormItem._key, treeNodes[treeFormIndex].name)
|
|
389
|
+
// });
|
|
389
390
|
}
|
|
390
391
|
// 非最后一列（最后一列前的列，非根节点），需继续向下循环
|
|
391
392
|
else {
|
|
@@ -172,10 +172,24 @@
|
|
|
172
172
|
},
|
|
173
173
|
// 删除标签
|
|
174
174
|
deleteTag (event, item, index) {
|
|
175
|
-
|
|
176
|
-
|
|
177
|
-
|
|
178
|
-
|
|
175
|
+
const cb = () => {
|
|
176
|
+
this.list.splice(index, 1);
|
|
177
|
+
this.callEliipsis();
|
|
178
|
+
this.$emit("change", [...this.list]);
|
|
179
|
+
this.$emit("delete", item, index);
|
|
180
|
+
};
|
|
181
|
+
|
|
182
|
+
if (this.propsObj.useDeleteTip === true) {
|
|
183
|
+
this.$Modal.confirm({
|
|
184
|
+
title: "提示",
|
|
185
|
+
content: `确定删除"${this.getItemName(item)}"吗？`,
|
|
186
|
+
onOk: () => {
|
|
187
|
+
cb();
|
|
188
|
+
}
|
|
189
|
+
});
|
|
190
|
+
} else {
|
|
191
|
+
cb();
|
|
192
|
+
}
|
|
179
193
|
},
|
|
180
194
|
// 改变标签状态
|
|
181
195
|
changeChecked (checked, name) {
|