From a326e663cd592d9fdc46497fff883758e10b86fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?BQ=C2=B7Wong?= <wangbinglilac@gmail.com>
Date: Sat, 13 May 2023 11:45:51 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90?=
 =?UTF-8?q?=EF=BC=8C=E6=95=B0=E6=8D=AE=E5=90=8D=E7=A7=B0=E4=BB=8E=E5=90=8E?=
 =?UTF-8?q?=E5=8F=B0=E5=8A=A0=E8=BD=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/tool/gen/index.ts          | 27 ++++++++++-----------
 src/api/tool/gen/types.ts          |  2 ++
 src/views/tool/gen/importTable.vue | 28 +++++++++++++++++----
 src/views/tool/gen/index.vue       | 39 ++++++++++++++++++------------
 4 files changed, 61 insertions(+), 35 deletions(-)

diff --git a/src/api/tool/gen/index.ts b/src/api/tool/gen/index.ts
index b95e865..1aaa7b2 100644
--- a/src/api/tool/gen/index.ts
+++ b/src/api/tool/gen/index.ts
@@ -5,7 +5,6 @@ import { AxiosPromise } from 'axios';
 // 查询生成表数据
 export const listTable = (query: TableQuery): AxiosPromise<TableVO[]> => {
   return request({
-    headers: { datasource: localStorage.getItem('dataName') },
     url: '/tool/gen/list',
     method: 'get',
     params: query
@@ -14,7 +13,6 @@ export const listTable = (query: TableQuery): AxiosPromise<TableVO[]> => {
 // 查询db数据库列表
 export const listDbTable = (query: DbTableQuery): AxiosPromise<DbTableVO[]> => {
   return request({
-    headers: { datasource: localStorage.getItem('dataName') },
     url: '/tool/gen/db/list',
     method: 'get',
     params: query
@@ -24,7 +22,6 @@ export const listDbTable = (query: DbTableQuery): AxiosPromise<DbTableVO[]> => {
 // 查询表详细信息
 export const getGenTable = (tableId: string | number): AxiosPromise<GenTableVO> => {
   return request({
-    headers: { datasource: localStorage.getItem('dataName') },
     url: '/tool/gen/' + tableId,
     method: 'get'
   });
@@ -33,7 +30,6 @@ export const getGenTable = (tableId: string | number): AxiosPromise<GenTableVO>
 // 修改代码生成信息
 export const updateGenTable = (data: DbTableForm) => {
   return request({
-    headers: { datasource: localStorage.getItem('dataName') },
     url: '/tool/gen',
     method: 'put',
     data: data
@@ -41,9 +37,8 @@ export const updateGenTable = (data: DbTableForm) => {
 };
 
 // 导入表
-export const importTable = (data: { tables: string }) => {
+export const importTable = (data: { tables: string, dataName: string }) => {
   return request({
-    headers: { datasource: localStorage.getItem('dataName') },
     url: '/tool/gen/importTable',
     method: 'post',
     params: data
@@ -53,7 +48,6 @@ export const importTable = (data: { tables: string }) => {
 // 预览生成代码
 export const previewTable = (tableId: string | number) => {
   return request({
-    headers: { datasource: localStorage.getItem('dataName') },
     url: '/tool/gen/preview/' + tableId,
     method: 'get'
   });
@@ -62,26 +56,31 @@ export const previewTable = (tableId: string | number) => {
 // 删除表数据
 export const delTable = (tableId: string | number | Array<string | number>) => {
   return request({
-    headers: { datasource: localStorage.getItem('dataName') },
     url: '/tool/gen/' + tableId,
     method: 'delete'
   });
 };
 
 // 生成代码（自定义路径）
-export const genCode = (tableName: string) => {
+export const genCode = (tableId: string | number) => {
   return request({
-    headers: { datasource: localStorage.getItem('dataName') },
-    url: '/tool/gen/genCode/' + tableName,
+    url: '/tool/gen/genCode/' + tableId,
     method: 'get'
   });
 };
 
 // 同步数据库
-export const synchDb = (tableName: string) => {
+export const synchDb = (tableId: string | number) => {
   return request({
-    headers: { datasource: localStorage.getItem('dataName') },
-    url: '/tool/gen/synchDb/' + tableName,
+    url: '/tool/gen/synchDb/' + tableId,
     method: 'get'
   });
 };
+
+// 获取数据源名称
+export const getDataNames = () => {
+  return request({
+    url: '/tool/gen/getDataNames',
+    method: 'get'
+  });
+};
\ No newline at end of file
diff --git a/src/api/tool/gen/types.ts b/src/api/tool/gen/types.ts
index 662c6e5..7f7b62f 100644
--- a/src/api/tool/gen/types.ts
+++ b/src/api/tool/gen/types.ts
@@ -1,6 +1,7 @@
 export interface TableVO extends BaseEntity {
   createDept: number | string;
   tableId: string | number;
+  dataName: string;
   tableName: string;
   tableComment: string;
   subTableName?: any;
@@ -97,6 +98,7 @@ export interface DbTableVO {
 }
 
 export interface DbTableQuery extends PageQuery {
+  dataName: string;
   tableName: string;
   tableComment: string;
 }
diff --git a/src/views/tool/gen/importTable.vue b/src/views/tool/gen/importTable.vue
index 5ff0145..eada1dc 100644
--- a/src/views/tool/gen/importTable.vue
+++ b/src/views/tool/gen/importTable.vue
@@ -1,8 +1,13 @@
 <template>
   <!-- 导入表 -->
-  <el-dialog title="导入表" v-model="visible" width="800px" top="5vh" append-to-body>
+  <el-dialog title="导入表" v-model="visible" width="1100px" top="5vh" append-to-body>
     <el-form :model="queryParams" ref="queryFormRef" :inline="true">
-      <el-form-item label="表名称" prop="tableName">
+      <el-form-item label="数据源" prop="dataName">
+            <el-select v-model="queryParams.dataName" filterable placeholder="请选择/输入数据源名称" style="width: 200px">
+              <el-option v-for="item in dataNameList" :key="item" :label="item" :value="item"> </el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="表名称" prop="tableName">
         <el-input v-model="queryParams.tableName" placeholder="请输入表名称" clearable @keyup.enter="handleQuery" />
       </el-form-item>
       <el-form-item label="表描述" prop="tableComment">
@@ -33,7 +38,7 @@
 </template>
 
 <script setup lang="ts">
-import { listDbTable, importTable } from '@/api/tool/gen';
+import { listDbTable, importTable, getDataNames } from '@/api/tool/gen';
 import { DbTableQuery, DbTableVO } from '@/api/tool/gen/types';
 import { ComponentInternalInstance } from 'vue';
 import { ElTable, ElForm } from 'element-plus';
@@ -50,14 +55,22 @@ const queryFormRef = ref(ElForm);
 const queryParams = reactive<DbTableQuery>({
     pageNum: 1,
     pageSize: 10,
+    dataName: '',
     tableName: '',
     tableComment: ''
 });
+const dataNameList = ref<Array<string>>([]);
 
 const emit = defineEmits(["ok"]);
 
 /** 查询参数列表 */
-const show = () => {
+const show = (dataName: string) => {
+    getDataNameList();
+    if(dataName){
+      queryParams.dataName = dataName;
+    } else {
+      queryParams.dataName = 'master';
+    }
     getList();
     visible.value = true;
 }
@@ -92,13 +105,18 @@ const handleImportTable = async () => {
         proxy?.$modal.msgError("请选择要导入的表");
         return;
     }
-    const res = await importTable({ tables: tableNames });
+    const res = await importTable({ tables: tableNames, dataName: queryParams.dataName });
     proxy?.$modal.msgSuccess(res.msg);
     if (res.code === 200) {
         visible.value = false;
         emit("ok");
     }
 }
+/** 查询多数据源名称 */
+const getDataNameList = async () => {
+  const res = await getDataNames()
+  dataNameList.value = res.data;
+}
 
 defineExpose({
     show,
diff --git a/src/views/tool/gen/index.vue b/src/views/tool/gen/index.vue
index f78bb0d..5775e6a 100644
--- a/src/views/tool/gen/index.vue
+++ b/src/views/tool/gen/index.vue
@@ -4,7 +4,10 @@
       <div class="search" v-show="showSearch">
         <el-form :model="queryParams" ref="queryFormRef" :inline="true" label-width="68px">
           <el-form-item label="数据源" prop="dataName">
-            <el-input v-model="queryParams.dataName" placeholder="请输入数据源名称" clearable style="width: 200px" @keyup.enter="handleQuery" />
+            <el-select v-model="queryParams.dataName" filterable clearable placeholder="请选择/输入数据源名称" style="width: 200px">
+              <el-option key="" label="全部" value="" />
+              <el-option v-for="item in dataNameList" :key="item" :label="item" :value="item"> </el-option>
+            </el-select>
           </el-form-item>
           <el-form-item label="表名称" prop="tableName">
             <el-input v-model="queryParams.tableName" placeholder="请输入表名称" clearable style="width: 200px" @keyup.enter="handleQuery" />
@@ -58,6 +61,7 @@
             <span>{{ (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1 }}</span>
           </template>
         </el-table-column>
+        <el-table-column label="数据源" align="center" prop="dataName" :show-overflow-tooltip="true" />
         <el-table-column label="表名称" align="center" prop="tableName" :show-overflow-tooltip="true" />
         <el-table-column label="表描述" align="center" prop="tableComment" :show-overflow-tooltip="true" />
         <el-table-column label="实体" align="center" prop="className" :show-overflow-tooltip="true" />
@@ -107,7 +111,7 @@
 </template>
 
 <script setup name="Gen" lang="ts">
-import { listTable, previewTable, delTable, genCode, synchDb } from '@/api/tool/gen';
+import { listTable, previewTable, delTable, genCode, synchDb, getDataNames } from '@/api/tool/gen';
 import { TableQuery, TableVO } from '@/api/tool/gen/types';
 import router from '@/router';
 import importTable from './importTable.vue';
@@ -124,9 +128,9 @@ const ids = ref<Array<string | number>>([]);
 const single = ref(true);
 const multiple = ref(true);
 const total = ref(0);
-const tableNames = ref<Array<string>>([]);
 const dateRange = ref<[DateModelType, DateModelType]>(['', '']);
 const uniqueId = ref("");
+const dataNameList = ref<Array<string>>([]);
 
 const queryFormRef = ref(ElForm);
 const importRef = ref(importTable);
@@ -136,7 +140,7 @@ const queryParams = ref<TableQuery>({
     pageSize: 10,
     tableName: '',
     tableComment: '',
-    dataName: "master"
+    dataName: ""
 })
 
 const preview = ref <any>({
@@ -148,8 +152,6 @@ const dialog = reactive<DialogOption>({
     title: '代码预览'
 });
 
-localStorage.setItem('dataName', queryParams.value.dataName);
-
 onActivated(() => {
     const time = route.query.t;
     if (time != null && time != uniqueId.value) {
@@ -161,6 +163,12 @@ onActivated(() => {
     }
 })
 
+/** 查询多数据源名称 */
+const getDataNameList = async () => {
+  const res = await getDataNames()
+  dataNameList.value = res.data;
+}
+
 /** 查询表集合 */
 const getList = async () => {
     loading.value = true;
@@ -171,34 +179,33 @@ const getList = async () => {
 }
 /** 搜索按钮操作 */
 const handleQuery = () => {
-    localStorage.setItem('dataName', queryParams.value.dataName);
     queryParams.value.pageNum = 1;
     getList();
 }
 /** 生成代码操作 */
 const handleGenTable = async (row?: TableVO) => {
-    const tbNames = row?.tableName || tableNames.value;
-    if (tbNames == "") {
+    const tbIds = row?.tableId || ids.value;
+    if (tbIds == "") {
         proxy?.$modal.msgError('请选择要生成的数据');
         return;
     }
     if (row?.genType === "1") {
-        await genCode(row.tableName);
+        await genCode(row.tableId);
         proxy?.$modal.msgSuccess('成功生成到自定义路径：' + row.genPath);
     } else {
-        proxy?.$download.zip('/tool/gen/batchGenCode?tables=' + tbNames, 'ruoyi.zip');
+        proxy?.$download.zip('/tool/gen/batchGenCode?tableIdStr=' + tbIds, 'ruoyi.zip');
     }
 }
 /** 同步数据库操作 */
 const handleSynchDb = async (row: TableVO) => {
-    const tableName = row.tableName;
-    await proxy?.$modal.confirm('确认要强制同步"' + tableName + '"表结构吗？');
-    await synchDb(tableName);
+    const tableId = row.tableId;
+    await proxy?.$modal.confirm('确认要强制同步"' + row.tableName + '"表结构吗？');
+    await synchDb(tableId);
     proxy?.$modal.msgSuccess('同步成功');
 }
 /** 打开导入表弹窗 */
 const openImportTable = () => {
-    importRef.value.show();
+    importRef.value.show(queryParams.value.dataName);
 }
 /** 重置按钮操作 */
 const resetQuery = () => {
@@ -220,7 +227,6 @@ const copyTextSuccess = () => {
 // 多选框选中数据
 const handleSelectionChange = (selection: TableVO[]) => {
     ids.value = selection.map(item => item.tableId);
-    tableNames.value = selection.map(item => item.tableName);
     single.value = selection.length != 1;
     multiple.value = !selection.length;
 }
@@ -240,5 +246,6 @@ const handleDelete = async (row?: TableVO) => {
 
 onMounted(() => {
     getList();
+    getDataNameList();
 })
 </script>

From f0df76aa8b0e42a864e14d3e3387c43484edee45 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90li?=
 <15040126243@163.com>
Date: Fri, 26 May 2023 11:26:47 +0800
Subject: [PATCH 2/3] =?UTF-8?q?fix=20=E4=BF=AE=E5=A4=8D=20=E8=A7=92?=
 =?UTF-8?q?=E8=89=B2=E6=95=B0=E6=8D=AE=E8=A6=86=E7=9B=96=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/role/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue
index 56c14c5..33189cd 100644
--- a/src/views/system/role/index.vue
+++ b/src/views/system/role/index.vue
@@ -358,7 +358,7 @@ const reset = () => {
     menuNodeAll.value = false
     deptExpand.value = true
     deptNodeAll.value = false
-    form.value = initForm
+    form.value = { ...initForm };
     roleFormRef.value.resetFields();
 
 }

From 7757d96f3444c283a21021324a7abcb22a29ee2e Mon Sep 17 00:00:00 2001
From: running0503 <xiangdeshan_120@sina.com>
Date: Wed, 31 May 2023 07:27:16 +0000
Subject: [PATCH 3/3] =?UTF-8?q?update=20vite/plugins/unocss.ts.=20?=
 =?UTF-8?q?=E5=9B=A0=E4=BD=8E=E6=B5=8F=E8=A7=88=E5=99=A8=E4=B8=8D=E6=94=AF?=
 =?UTF-8?q?=E6=8C=81=20top-level=20await=EF=BC=8C=E4=BC=9A=E6=8A=A5=20=5F?=
 =?UTF-8?q?=5Funo.css:9=20Uncaught=20SyntaxError:=20Unexpected=20reserved?=
 =?UTF-8?q?=20word?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

hmrTopLevelAwait
unocss默认是true，低版本浏览器是不支持启动后会报错

Signed-off-by: running0503 <xiangdeshan_120@sina.com>
---
 vite/plugins/unocss.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/vite/plugins/unocss.ts b/vite/plugins/unocss.ts
index 997335a..8d4e012 100644
--- a/vite/plugins/unocss.ts
+++ b/vite/plugins/unocss.ts
@@ -8,6 +8,7 @@ export default () => {
     shortcuts: {
       'panel-title':
         'pb-[5px] font-sans leading-[1.1] font-medium text-base text-[#6379bb] border-b border-b-solid border-[var(--el-border-color-light)] mb-5 mt-0'
-    }
+    },
+    hmrTopLevelAwait: false, // unocss默认是true，低版本浏览器是不支持的，启动后会报错
   });
 };