adminforth 1.7.0-next.2 → 1.7.0-next.4
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.
|
@@ -11,7 +11,7 @@
|
|
|
11
11
|
}"
|
|
12
12
|
>
|
|
13
13
|
<component v-if="item.icon" :is="getIcon(item.icon)" class="w-5 h-5 text-lightSidebarIcons dark:text-darkSidebarIcons transition duration-75 group-hover:text-lightSidebarIconsHover dark:group-hover:text-darkSidebarIconsHover" ></component>
|
|
14
|
-
<span class="ms-3">{{ item.label }}</span>
|
|
14
|
+
<span class="text-ellipsis overflow-hidden ms-3">{{ item.label }}</span>
|
|
15
15
|
<span v-if="item.badge" class="inline-flex items-center justify-center h-3 py-3 px-1 ms-3 text-sm font-medium rounded-full bg-lightAnnouncementBG dark:bg-darkAnnouncementBG
|
|
16
16
|
fill-lightAnnouncementText dark:fill-darkAccent text-lightAnnouncementText dark:text-darkAccent min-w-[1.5rem] max-w-[3rem]"
|
|
17
17
|
>
|
|
@@ -197,7 +197,11 @@ async function getList() {
|
|
|
197
197
|
return {error: data.error};
|
|
198
198
|
}
|
|
199
199
|
rows.value = data.data?.map(row => {
|
|
200
|
-
|
|
200
|
+
if (coreStore.resource.columns.find(c => c.primaryKey).foreignResource) {
|
|
201
|
+
row._primaryKeyValue = row[coreStore.resource.columns.find(c => c.primaryKey).name].pk;
|
|
202
|
+
} else {
|
|
203
|
+
row._primaryKeyValue = row[coreStore.resource.columns.find(c => c.primaryKey).name];
|
|
204
|
+
}
|
|
201
205
|
return row;
|
|
202
206
|
});
|
|
203
207
|
totalRows.value = data.total;
|