From b66d2f6a0c984f7ad1e900a5309bc1abe71744a8 Mon Sep 17 00:00:00 2001
From: wujingjing <gersonwu@qq.com>
Date: 星期五, 06 九月 2024 15:51:41 +0800
Subject: [PATCH] amis编辑

---
 customer_list/common/static/fonts/ywiconfont/iconfont.ttf   |    0 
 customer_list/common/static/fonts/ywiconfont/iconfont.woff  |    0 
 vite.config.ts                                              |    2 
 src/api/login/UserMenuData.ts                               |   35 +++++++++--------
 customer_list/yw/static/config/route.js                     |    4 +-
 src/assets/logo/amis-logo.png                               |    0 
 src/views/project/yw/lowCode/sqlAmis/SqlAmis.vue            |   20 ++++++++-
 customer_list/common/static/fonts/ywiconfont/iconfont.css   |   14 +++++-
 customer_list/common/static/fonts/ywiconfont/iconfont.woff2 |    0 
 9 files changed, 49 insertions(+), 26 deletions(-)

diff --git a/customer_list/common/static/fonts/ywiconfont/iconfont.css b/customer_list/common/static/fonts/ywiconfont/iconfont.css
index 1ada248..a8a9f0a 100644
--- a/customer_list/common/static/fonts/ywiconfont/iconfont.css
+++ b/customer_list/common/static/fonts/ywiconfont/iconfont.css
@@ -1,8 +1,8 @@
 @font-face {
   font-family: "ywifont"; /* Project id 4655417 */
-  src: url('iconfont.woff2?t=1724998991284') format('woff2'),
-       url('iconfont.woff?t=1724998991284') format('woff'),
-       url('iconfont.ttf?t=1724998991284') format('truetype');
+  src: url('iconfont.woff2?t=1725604258485') format('woff2'),
+       url('iconfont.woff?t=1725604258485') format('woff'),
+       url('iconfont.ttf?t=1725604258485') format('truetype');
 }
 
 .ywifont {
@@ -13,6 +13,14 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.ywicon-didaima:before {
+  content: "\e636";
+}
+
+.ywicon-cshy-shizhong:before {
+  content: "\e635";
+}
+
 .ywicon-wendang:before {
   content: "\e67c";
 }
diff --git a/customer_list/common/static/fonts/ywiconfont/iconfont.ttf b/customer_list/common/static/fonts/ywiconfont/iconfont.ttf
index f1f7761..5ed55eb 100644
--- a/customer_list/common/static/fonts/ywiconfont/iconfont.ttf
+++ b/customer_list/common/static/fonts/ywiconfont/iconfont.ttf
Binary files differ
diff --git a/customer_list/common/static/fonts/ywiconfont/iconfont.woff b/customer_list/common/static/fonts/ywiconfont/iconfont.woff
index f29261d..b8ef9dc 100644
--- a/customer_list/common/static/fonts/ywiconfont/iconfont.woff
+++ b/customer_list/common/static/fonts/ywiconfont/iconfont.woff
Binary files differ
diff --git a/customer_list/common/static/fonts/ywiconfont/iconfont.woff2 b/customer_list/common/static/fonts/ywiconfont/iconfont.woff2
index 4b517f5..ac07027 100644
--- a/customer_list/common/static/fonts/ywiconfont/iconfont.woff2
+++ b/customer_list/common/static/fonts/ywiconfont/iconfont.woff2
Binary files differ
diff --git a/customer_list/yw/static/config/route.js b/customer_list/yw/static/config/route.js
index 3460abb..d7bcee9 100644
--- a/customer_list/yw/static/config/route.js
+++ b/customer_list/yw/static/config/route.js
@@ -3,14 +3,14 @@
 		name: 'AmisEditor',
 		isKeepAlive: true,
 		isAffix: true,
-		path: '/home',
+		path: '/amisEditor',
 		component: '/project/yw/lowCode/amis/AmisEditor.vue',
 	},
 	{
 		name: 'SqlAmis',
 		isKeepAlive: true,
 		isAffix: false,
-		path: '/lowCode/sqlAmis',
+		path: '/home',
 		component: '/project/yw/lowCode/sqlAmis/SqlAmis.vue',
 	},
 	// {
diff --git a/src/api/login/UserMenuData.ts b/src/api/login/UserMenuData.ts
index 624da25..76753a9 100644
--- a/src/api/login/UserMenuData.ts
+++ b/src/api/login/UserMenuData.ts
@@ -14,29 +14,14 @@
 		SortCode: 1,
 		Description: '',
 		Children: [
-			{
-				Children: [],
-				ID: '1',
-				ParentID: '1742436890822447104',
-				Type: 2,
-				Name: 'AMIS缂栬緫',
-				Path: '/home',
-				Permission: '',
-				Icon: 'ywifont ywicon-a-appround15',
-				IsIframe: true,
-				OutLink: '/amis-editor/index.html?session={token}',
-				IsHide: false,
-				Weight: 0,
-				SortCode: 2,
-				Description: '',
-			},
+			
 			{
 				Children: [],
 				ID: '3',
 				ParentID: '1742436890822447104',
 				Type: 2,
 				Name: '椤甸潰绠$悊',
-				Path: '/lowCode/sqlAmis',
+				Path: '/home',
 				Permission: '',
 				Icon: 'ywifont ywicon-a-appround15',
 				IsIframe: false,
@@ -46,6 +31,22 @@
 				SortCode: 2,
 				Description: '',
 			},
+			{
+				Children: [],
+				ID: '1',
+				ParentID: '1742436890822447104',
+				Type: 2,
+				Name: 'AMIS缂栬緫',
+				Path: '/amisEditor',
+				Permission: '',
+				Icon: 'ywifont ywicon-a-appround15',
+				IsIframe: true,
+				OutLink: '/amis-editor/index.html?session={token}#/edit/lowCode',
+				IsHide: true,
+				Weight: 0,
+				SortCode: 2,
+				Description: '',
+			}
 			// {
 			// 	Children: [],
 			// 	ID: '2',
diff --git a/src/assets/logo/amis-logo.png b/src/assets/logo/amis-logo.png
new file mode 100644
index 0000000..892c2ec
--- /dev/null
+++ b/src/assets/logo/amis-logo.png
Binary files differ
diff --git a/src/views/project/yw/lowCode/sqlAmis/SqlAmis.vue b/src/views/project/yw/lowCode/sqlAmis/SqlAmis.vue
index a0109cf..cc09128 100644
--- a/src/views/project/yw/lowCode/sqlAmis/SqlAmis.vue
+++ b/src/views/project/yw/lowCode/sqlAmis/SqlAmis.vue
@@ -27,14 +27,14 @@
 				:data="displayTableData"
 				highlight-current-row
 			>
-				<el-table-column type="expand" fixed="left">
+				<!-- <el-table-column type="expand" fixed="left">
 					<template #default="scope">
 						<div class="px-4">
 							<h3 class="mb-2">椤甸潰鍙傛暟</h3>
 							<JsonEditor currentMode="view" :modelValue="scope.row.args" />
 						</div>
 					</template>
-				</el-table-column>
+				</el-table-column> -->
 
 				<el-table-column prop="title" label="鏍囬" width="300" fixed="left" show-overflow-tooltip> </el-table-column>
 				<el-table-column prop="prompt" label="鎻愮ず璇�" show-overflow-tooltip> </el-table-column>
@@ -62,6 +62,9 @@
 						<div class="space-x-2.5">
 							<el-tooltip effect="dark" content="SQL缂栬緫" placement="top">
 								<i class="ywifont ywicon-sql !text-[14px] text-blue-400 cursor-pointer" @click="editSqlClick(scope.row)"></i>
+							</el-tooltip>
+							<el-tooltip effect="dark" content="AMIS浣庝唬鐮佺紪杈�" placement="top">
+								<i class="ywifont ywicon-didaima !text-[21px] text-blue-400 cursor-pointer" @click="gotoAmisPage(scope.row)"></i>
 							</el-tooltip>
 							<el-tooltip effect="dark" content="缂栬緫" placement="top">
 								<i class="ywifont ywicon-bianji !text-[14px] text-blue-400 cursor-pointer" @click="openOptDlg(scope.row)"></i>
@@ -106,7 +109,8 @@
 import * as supervisorAdminApi from '/@/api/supervisorAdmin';
 import { updatePublishStatus } from '/@/api/supervisorAdmin';
 import JsonEditor from '/@/components/form/jsonEditor/JsonEditor.vue';
-
+import amisLogo from '/@/assets/logo/amis-logo.png'
+import { gotoRoute } from '/@/utils/route';
 //#region ====================== 琛ㄦ牸鏁版嵁锛宼able init ======================
 const tableLoading = ref(false);
 const tableData = ref([]);
@@ -199,6 +203,16 @@
 	displayTableData.value[index].published = isPublished;
 };
 //#endregion
+
+//#region ====================== 璺宠浆浣庝唬鐮佺紪杈戦〉闈� ======================
+	const gotoAmisPage = (row) => {
+		window.currentPage = row;
+		gotoRoute({
+			name:'AmisEditor'
+		
+		})
+	};
+//#endregion
 onMounted(() => {
 	getTableData();
 });
diff --git a/vite.config.ts b/vite.config.ts
index 5b25f9d..91ced05 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -39,7 +39,7 @@
 			host: '0.0.0.0',
 			port: env.VITE_PORT as unknown as number,
 			open: JSON.parse(env.VITE_OPEN),
-			hmr: true,
+			hmr: false,
 			proxy: {
 				'/gitee': {
 					target: 'https://gitee.com',

--
Gitblit v1.9.3