浏览代码

fix(AdvancedTable): Cant use deep column properties

Owen Diffey 3 年之前
父节点
当前提交
b61e605a21
共有 2 个文件被更改,包括 12 次插入7 次删除
  1. 8 3
      frontend/src/components/AdvancedTable.vue
  2. 4 4
      frontend/src/pages/Admin/tabs/Users.vue

+ 8 - 3
frontend/src/components/AdvancedTable.vue

@@ -472,9 +472,14 @@
 									:item="item"
 									v-if="
 										column.properties.length === 0 ||
-										column.properties.every(
-											property =>
-												item[property] !== undefined
+										column.properties.every(property =>
+											property
+												.split('.')
+												.reduce(
+													(p, c) =>
+														(p && p[c]) || null,
+													item
+												)
 										)
 									"
 								></slot>

+ 4 - 4
frontend/src/pages/Admin/tabs/Users.vue

@@ -293,7 +293,7 @@ export default {
 					{
 						name: "githubId",
 						displayName: "GitHub ID",
-						properties: ["services"],
+						properties: ["services.github.id"],
 						sortProperty: "services.github.id",
 						minWidth: 115,
 						defaultWidth: 115
@@ -315,14 +315,14 @@ export default {
 					{
 						name: "emailAddress",
 						displayName: "Email Address",
-						properties: ["email"],
+						properties: ["email.address"],
 						sortProperty: "email.address",
 						defaultVisibility: "hidden"
 					},
 					{
 						name: "emailVerified",
 						displayName: "Email Verified",
-						properties: ["email"],
+						properties: ["email.verified"],
 						sortProperty: "email.verified",
 						defaultVisibility: "hidden",
 						minWidth: 140,
@@ -331,7 +331,7 @@ export default {
 					{
 						name: "songsRequested",
 						displayName: "Songs Requested",
-						properties: ["statistics"],
+						properties: ["statistics.songsRequested"],
 						sortProperty: "statistics.songsRequested",
 						minWidth: 170,
 						defaultWidth: 170