ol-base-components 3.2.9 → 3.2.11
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
CHANGED
|
@@ -12,6 +12,10 @@
|
|
|
12
12
|
export default {
|
|
13
13
|
name: "customSearch",
|
|
14
14
|
props: {
|
|
15
|
+
menuId: {
|
|
16
|
+
type: String,
|
|
17
|
+
default: "",
|
|
18
|
+
},
|
|
15
19
|
formSearchData: {
|
|
16
20
|
type: Object,
|
|
17
21
|
default: () => {
|
|
@@ -63,10 +67,12 @@ export default {
|
|
|
63
67
|
const menus = SET_MENUS;
|
|
64
68
|
this.currentPageItem = handleMenu(menus, this);
|
|
65
69
|
|
|
70
|
+
const targetMenuId = this.menuId || (this.currentPageItem && this.currentPageItem.id);
|
|
71
|
+
|
|
66
72
|
this.get({
|
|
67
73
|
url: `/api/app/menu-search-setting/by-menu`,
|
|
68
74
|
data: {
|
|
69
|
-
sysMenuId:
|
|
75
|
+
sysMenuId: targetMenuId,
|
|
70
76
|
},
|
|
71
77
|
}).then(res => {
|
|
72
78
|
if (res.code !== 200) return;
|
|
@@ -79,10 +85,12 @@ export default {
|
|
|
79
85
|
},
|
|
80
86
|
//保存
|
|
81
87
|
onSave(configList) {
|
|
88
|
+
const targetMenuId = this.menuId || (this.currentPageItem && this.currentPageItem.id);
|
|
89
|
+
|
|
82
90
|
this.post({
|
|
83
91
|
url: `/api/app/menu-search-setting`,
|
|
84
92
|
data: {
|
|
85
|
-
sysMenuId:
|
|
93
|
+
sysMenuId: targetMenuId,
|
|
86
94
|
settingJson: JSON.stringify(configList),
|
|
87
95
|
},
|
|
88
96
|
}).then(res => {
|
|
@@ -541,6 +541,13 @@ export default {
|
|
|
541
541
|
row.props = {};
|
|
542
542
|
}
|
|
543
543
|
this.updateDatePickerProps(row);
|
|
544
|
+
|
|
545
|
+
const rangeTypes = ["daterange", "datetimerange", "monthrange"];
|
|
546
|
+
if (rangeTypes.includes(row.dateType)) {
|
|
547
|
+
row.compare = "range";
|
|
548
|
+
} else {
|
|
549
|
+
row.compare = "eq";
|
|
550
|
+
}
|
|
544
551
|
},
|
|
545
552
|
updateDatePickerProps(row) {
|
|
546
553
|
const dateType = row.dateType || "date";
|