From 1c2da6dfb1e23fa38c58ada5d7e98f91ae2d738e Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: 星期三, 11 九月 2024 14:19:21 +0800
Subject: [PATCH] 修改导出文件名称

---
 src/views/tool/gen/genInfoForm.vue |   70 ++++++++++++++++++++++------------
 1 files changed, 45 insertions(+), 25 deletions(-)

diff --git a/src/views/tool/gen/genInfoForm.vue b/src/views/tool/gen/genInfoForm.vue
index dc6a181..2e7ca45 100644
--- a/src/views/tool/gen/genInfoForm.vue
+++ b/src/views/tool/gen/genInfoForm.vue
@@ -13,11 +13,21 @@
       </el-col>
 
       <el-col :span="12">
+        <el-form-item prop="tplWebType">
+          <template #label>鍓嶇绫诲瀷</template>
+          <el-select v-model="info.tplWebType">
+            <el-option label="Vue2 Element UI 妯$増" value="element-ui" />
+            <el-option label="Vue3 Element Plus 妯$増" value="element-plus" />
+          </el-select>
+        </el-form-item>
+      </el-col>
+
+      <el-col :span="12">
         <el-form-item prop="packageName">
           <template #label>
             鐢熸垚鍖呰矾寰�
             <el-tooltip content="鐢熸垚鍦ㄥ摢涓猨ava鍖呬笅锛屼緥濡� com.ruoyi.system" placement="top">
-              <i class="el-icon-question"></i>
+              <el-icon><question-filled /></el-icon>
             </el-tooltip>
           </template>
           <el-input v-model="info.packageName" />
@@ -29,7 +39,7 @@
           <template #label>
             鐢熸垚妯″潡鍚�
             <el-tooltip content="鍙悊瑙d负瀛愮郴缁熷悕锛屼緥濡� system" placement="top">
-              <i class="el-icon-question"></i>
+              <el-icon><question-filled /></el-icon>
             </el-tooltip>
           </template>
           <el-input v-model="info.moduleName" />
@@ -41,7 +51,7 @@
           <template #label>
             鐢熸垚涓氬姟鍚�
             <el-tooltip content="鍙悊瑙d负鍔熻兘鑻辨枃鍚嶏紝渚嬪 user" placement="top">
-              <i class="el-icon-question"></i>
+              <el-icon><question-filled /></el-icon>
             </el-tooltip>
           </template>
           <el-input v-model="info.businessName" />
@@ -53,10 +63,23 @@
           <template #label>
             鐢熸垚鍔熻兘鍚�
             <el-tooltip content="鐢ㄤ綔绫绘弿杩帮紝渚嬪 鐢ㄦ埛" placement="top">
-              <i class="el-icon-question"></i>
+              <el-icon><question-filled /></el-icon>
             </el-tooltip>
           </template>
           <el-input v-model="info.functionName" />
+        </el-form-item>
+      </el-col>
+
+      <el-col :span="12">
+        <el-form-item prop="genType">
+          <template #label>
+            鐢熸垚浠g爜鏂瑰紡
+            <el-tooltip content="榛樿涓簔ip鍘嬬缉鍖呬笅杞斤紝涔熷彲浠ヨ嚜瀹氫箟鐢熸垚璺緞" placement="top">
+              <el-icon><question-filled /></el-icon>
+            </el-tooltip>
+          </template>
+          <el-radio v-model="info.genType" value="0">zip鍘嬬缉鍖�</el-radio>
+          <el-radio v-model="info.genType" value="1">鑷畾涔夎矾寰�</el-radio>
         </el-form-item>
       </el-col>
 
@@ -65,7 +88,7 @@
           <template #label>
             涓婄骇鑿滃崟
             <el-tooltip content="鍒嗛厤鍒版寚瀹氳彍鍗曚笅锛屼緥濡� 绯荤粺绠$悊" placement="top">
-              <i class="el-icon-question"></i>
+              <el-icon><question-filled /></el-icon>
             </el-tooltip>
           </template>
           <tree-select
@@ -77,25 +100,12 @@
         </el-form-item>
       </el-col>
 
-      <el-col :span="12">
-        <el-form-item prop="genType">
-          <template #label>
-            鐢熸垚浠g爜鏂瑰紡
-            <el-tooltip content="榛樿涓簔ip鍘嬬缉鍖呬笅杞斤紝涔熷彲浠ヨ嚜瀹氫箟鐢熸垚璺緞" placement="top">
-              <i class="el-icon-question"></i>
-            </el-tooltip>
-          </template>
-          <el-radio v-model="info.genType" label="0">zip鍘嬬缉鍖�</el-radio>
-          <el-radio v-model="info.genType" label="1">鑷畾涔夎矾寰�</el-radio>
-        </el-form-item>
-      </el-col>
-
       <el-col :span="24" v-if="info.genType == '1'">
         <el-form-item prop="genPath">
           <template #label>
             鑷畾涔夎矾寰�
             <el-tooltip content="濉啓纾佺洏缁濆璺緞锛岃嫢涓嶅~鍐欙紝鍒欑敓鎴愬埌褰撳墠Web椤圭洰涓�" placement="top">
-              <i class="el-icon-question"></i>
+              <el-icon><question-filled /></el-icon>
             </el-tooltip>
           </template>
           <el-input v-model="info.genPath">
@@ -125,7 +135,7 @@
             <template #label>
               鏍戠紪鐮佸瓧娈�
               <el-tooltip content="鏍戞樉绀虹殑缂栫爜瀛楁鍚嶏紝 濡傦細dept_id" placement="top">
-                <i class="el-icon-question"></i>
+                <el-icon><question-filled /></el-icon>
               </el-tooltip>
             </template>
             <el-select v-model="info.treeCode" placeholder="璇烽�夋嫨">
@@ -143,7 +153,7 @@
             <template #label>
               鏍戠埗缂栫爜瀛楁
               <el-tooltip content="鏍戞樉绀虹殑鐖剁紪鐮佸瓧娈靛悕锛� 濡傦細parent_Id" placement="top">
-                <i class="el-icon-question"></i>
+                <el-icon><question-filled /></el-icon>
               </el-tooltip>
             </template>
             <el-select v-model="info.treeParentCode" placeholder="璇烽�夋嫨">
@@ -161,7 +171,7 @@
             <template #label>
               鏍戝悕绉板瓧娈�
               <el-tooltip content="鏍戣妭鐐圭殑鏄剧ず鍚嶇О瀛楁鍚嶏紝 濡傦細dept_name" placement="top">
-                <i class="el-icon-question"></i>
+                <el-icon><question-filled /></el-icon>
               </el-tooltip>
             </template>
             <el-select v-model="info.treeName" placeholder="璇烽�夋嫨">
@@ -185,7 +195,7 @@
             <template #label>
               鍏宠仈瀛愯〃鐨勮〃鍚�
               <el-tooltip content="鍏宠仈瀛愯〃鐨勮〃鍚嶏紝 濡傦細sys_user" placement="top">
-                <i class="el-icon-question"></i>
+                <el-icon><question-filled /></el-icon>
               </el-tooltip>
             </template>
             <el-select v-model="info.subTableName" placeholder="璇烽�夋嫨" @change="subSelectChange">
@@ -203,7 +213,7 @@
             <template #label>
               瀛愯〃鍏宠仈鐨勫閿悕
               <el-tooltip content="瀛愯〃鍏宠仈鐨勫閿悕锛� 濡傦細user_id" placement="top">
-                <i class="el-icon-question"></i>
+                <el-icon><question-filled /></el-icon>
               </el-tooltip>
             </template>
             <el-select v-model="info.subTableFkName" placeholder="璇烽�夋嫨">
@@ -226,7 +236,7 @@
 import { listMenu } from "@/api/system/menu";
 
 const subColumns = ref([]);
-const menuOptions = ref({});
+const menuOptions = ref([]);
 const { proxy } = getCurrentInstance();
 
 const props = defineProps({
@@ -248,15 +258,18 @@
   businessName: [{ required: true, message: "璇疯緭鍏ョ敓鎴愪笟鍔″悕", trigger: "blur" }],
   functionName: [{ required: true, message: "璇疯緭鍏ョ敓鎴愬姛鑳藉悕", trigger: "blur" }]
 });
+
 function subSelectChange(value) {
   props.info.subTableFkName = "";
 }
+
 function tplSelectChange(value) {
   if (value !== "sub") {
     props.info.subTableName = "";
     props.info.subTableFkName = "";
   }
 }
+
 function setSubTableColumns(value) {
   for (var item in props.tables) {
     const name = props.tables[item].tableName;
@@ -266,6 +279,7 @@
     }
   }
 }
+
 /** 鏌ヨ鑿滃崟涓嬫媺鏍戠粨鏋� */
 function getMenuTreeselect() {
   listMenu().then(response => {
@@ -277,5 +291,11 @@
   setSubTableColumns(val);
 });
 
+watch(() => props.info.tplWebType, val => {
+  if (val === '') {
+    props.info.tplWebType = "element-plus";
+  }
+});
+
 getMenuTreeselect();
 </script>

--
Gitblit v1.9.3