adminforth 2.2.0-next.3 → 2.2.0-next.4

package/dist/spa/src/components/ResourceListTable.vue

@@ -84,7 +84,7 @@
           </td>
         </tr>
 
-        <tr @mousedown="onClick($event,row)" 
+        <tr @click="onClick($event,row)" 
           v-else v-for="(row, rowI) in rows" :key="`row_${row._primaryKeyValue}`"
           ref="rowRefs"
           class="bg-lightListTable dark:bg-darkListTable border-lightListBorder dark:border-gray-700 hover:bg-lightListTableRowHover dark:hover:bg-darkListTableRowHover"
@@ -457,50 +457,48 @@ function onSortButtonClick(event, field) {
 
 const clickTarget = ref(null);
 
-async function onClick(e, row) {
-  if (clickTarget.value === e.target) return;
+async function onClick(e,row) {
+  if(clickTarget.value === e.target) return;
   clickTarget.value = e.target;
   await new Promise((resolve) => setTimeout(resolve, 100));
   if (window.getSelection().toString()) return;
-  if (e.button === 2) {
-    return; // right click, do nothing
-  }
-  const openInNewTab =
-    e.ctrlKey ||
-    e.metaKey ||
-    e.button === 1 ||
-    (row._clickUrl?.includes('target=_blank'));
-
-  if (openInNewTab) {
-    if (row._clickUrl) {
-      window.open(row._clickUrl, '_blank');
+  else {
+    if (row._clickUrl === null) {
+      // user asked to nothing on click
+      return;
+    }
+    if (e.ctrlKey || e.metaKey || row._clickUrl?.includes('target=_blank')) {
+      
+      if (row._clickUrl) {
+        window.open(row._clickUrl, '_blank');
+      } else {
+        window.open(
+          router.resolve({
+            name: 'resource-show',
+            params: {
+              resourceId: props.resource.resourceId,
+              primaryKey: row._primaryKeyValue,
+            },
+          }).href,
+          '_blank'
+        );
+      }
     } else {
-      window.open(
-        router.resolve({
+      if (row._clickUrl) {
+        if (row._clickUrl.startsWith('http')) {
+          document.location.href = row._clickUrl;
+        } else {
+          router.push(row._clickUrl);
+        }
+      } else {
+        router.push({
           name: 'resource-show',
           params: {
             resourceId: props.resource.resourceId,
             primaryKey: row._primaryKeyValue,
           },
-        }).href,
-        '_blank'
-      );
-    }
-  } else {
-    if (row._clickUrl) {
-      if (row._clickUrl.startsWith('http')) {
-        document.location.href = row._clickUrl;
-      } else {
-        router.push(row._clickUrl);
+        });
       }
-    } else {
-      router.push({
-        name: 'resource-show',
-        params: {
-          resourceId: props.resource.resourceId,
-          primaryKey: row._primaryKeyValue,
-        },
-      });
     }
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "adminforth",
-  "version": "2.2.0-next.3",
+  "version": "2.2.0-next.4",
   "description": "OpenSource Vue3 powered forth-generation admin panel",
   "main": "dist/index.js",
   "module": "dist/index.js",