bri-components 1.4.37 → 1.4.39
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/extra/themeColor.vue +1 -1
- package/src/components/controls/extra/themeIcon.vue +1 -1
- package/src/components/controls/mixins/cascaderMixin.js +1 -1
- package/src/components/controls/mixins/controlMixin.js +5 -5
- package/src/components/controls/mixins/userAndDepartMixin.js +1 -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/package.json
CHANGED
|
@@ -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 // 级联拼接符
|
|
@@ -115,7 +115,7 @@ export default {
|
|
|
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;
|
|
@@ -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 {
|