Skip to content

Commit 5d9142b

Browse files
committed
Merge branch 'feature-sprint2' of https://10.30.90.89:10080/luban/dataspherestudio into feature-sprint2
2 parents 7a449a2 + dc0b440 commit 5d9142b

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

web/src/apps/dataService/module/dataService/index.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@ export default {
191191
if (isUpdate) {
192192
isHad = false;
193193
const groupData = this.allProjectTree.find(item => {
194-
return item.id + "" === this.apiForm.groupId + "";
194+
return item.groupId + "" === this.apiForm.groupId + "";
195195
});
196196
if (groupData) {
197197
const apis2 = groupData.apis || [];

web/src/apps/workspace/module/permissions/module/departManagement.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@
100100
$t('message.permissions.superior') +
101101
$t('message.permissions.forSelect')
102102
"
103-
defaultExpandLevel="Infinity"
103+
:defaultExpandLevel="Infinity"
104104
search-nested
105105
required
106106
style="width: 300px"

web/src/apps/workspace/module/permissions/module/personManagement.vue

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@
161161
$t('message.permissions.userDepart') +
162162
$t('message.permissions.forSelect')
163163
"
164-
defaultExpandLevel="Infinity"
164+
:defaultExpandLevel="Infinity"
165165
search-nested
166166
required
167167
style="width: 300px"
@@ -333,8 +333,8 @@ export default {
333333
tag === "empty"
334334
? this.$t("message.permissions.passwordEmpty")
335335
: tag === "keyboard"
336-
? this.$t("message.permissions.pwdKeyboardError")
337-
: this.$t("message.permissions.pwdCheckError")
336+
? this.$t("message.permissions.pwdKeyboardError")
337+
: this.$t("message.permissions.pwdCheckError")
338338
)
339339
);
340340
}

0 commit comments

Comments
 (0)