From a4493420db2a0141020153d6df7d6393d9b3039c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=8F=E9=99=8C?= <xiaomo.drip@gmail.com>
Date: Thu, 31 Aug 2023 16:52:44 +0800
Subject: [PATCH] no message

---
 src/components/xTable/columnItem.vue | 13 +++++++++++--
 src/views/system/table/index.vue     |  7 +++++--
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/src/components/xTable/columnItem.vue b/src/components/xTable/columnItem.vue
index 72f2468..a2f492f 100644
--- a/src/components/xTable/columnItem.vue
+++ b/src/components/xTable/columnItem.vue
@@ -67,8 +67,17 @@
 		methods: {
 			handleClick(row, item){
 
+
+				console.log(item)
+
+				// 打开新窗口链接
+				if (item.open && item.open.name && row[item.open.name]?.trim()) {
+					window.open(row[item.open.name], "_blank");
+					return ;
+				}
+
 				// 打开编辑层
-				if (item.update && (item.update.url || item.update.name)) {
+				else if (item.update && (item.update.url || item.update.name)) {
 					this.$emit('xtableupdate', row, {
 						name:item.update.name || item.name, 
 						remoteurl: item.update.url || 'table/getUpdate?name='+item.update.name
@@ -77,7 +86,7 @@
 				}
 
 				// 打开表格
-				if (item.table && (item.table.url || item.table.name)) {
+				else if (item.table && (item.table.url || item.table.name)) {
 					this.$emit('xtableupdate', row, {
 						name:item.table.name || item.name, 
 						remoteurl: item.table.url || 'table/get?name='+item.table.name
diff --git a/src/views/system/table/index.vue b/src/views/system/table/index.vue
index ee3fa1f..86f065c 100644
--- a/src/views/system/table/index.vue
+++ b/src/views/system/table/index.vue
@@ -100,6 +100,7 @@
 				stat:[],
 				chartoption: {},
 				tablename:  this.$route.meta.tablename,
+				tableurl:  this.$route.meta.tableurl,
 				groupFilterText:'',
 				tabskey:'',
 				tabsdefaultvalue:''
@@ -109,9 +110,11 @@
 			if (this.name) {
 				this.tablename = this.name || this.$route.meta.tablename;
 			}
+
 			//判断是否开启自定义列
-			if(this.tablename) {
-				this.$api.system.table.get(this.tablename, { cache: this.$route.meta.tablecache || 0 }).then((res) => {
+			if(this.tablename || this.tableurl) {
+				var awaitvar = this.tableurl ? this.$http.get(this.tableurl, {}, {cache:true}) : this.$api.system.table.get(this.tablename, { cache: this.$route.meta.tablecache || 0 });
+				awaitvar.then((res) => {
 				    if (res.code == 200) {
 				    	Object.assign(this.$data, res.data);
 				    	if (res.data.tabsdefaultvalue && res.data.tabskey) {