From c334c2d76c1b51d0fbe1531bf524e1b90f921a7c Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期二, 20 五月 2025 15:16:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
src/views/tool/gen/genInfoForm.vue | 120 ++++++++++++++++++++++++++++++++++++------------------------
1 files changed, 72 insertions(+), 48 deletions(-)
diff --git a/src/views/tool/gen/genInfoForm.vue b/src/views/tool/gen/genInfoForm.vue
index dc6a181..b416a89 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="鍙悊瑙ｄ负瀛愮郴缁熷悕锛屼緥濡� 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="鍙悊瑙ｄ负鍔熻兘鑻辨枃鍚嶏紝渚嬪 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,27 +63,10 @@
<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>
- <template #label>
- 涓婄骇鑿滃崟
- <el-tooltip content="鍒嗛厤鍒版寚瀹氳彍鍗曚笅锛屼緥濡� 绯荤粺绠＄悊" placement="top">
- <i class="el-icon-question"></i>
- </el-tooltip>
- </template>
- <tree-select
- v-model:value="info.parentMenuId"
- :options="menuOptions"
- :objMap="{ value: 'menuId', label: 'menuName', children: 'children' }"
- placeholder="璇烽�夋嫨绯荤粺鑿滃崟"
- />
</el-form-item>
</el-col>
@@ -82,11 +75,30 @@
<template #label>
鐢熸垚浠ｇ爜鏂瑰紡
<el-tooltip content="榛樿涓簔ip鍘嬬缉鍖呬笅杞斤紝涔熷彲浠ヨ嚜瀹氫箟鐢熸垚璺緞" placement="top">
- <i class="el-icon-question"></i>
+ <el-icon><question-filled /></el-icon>
</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-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>
+
+ <el-col :span="12">
+ <el-form-item>
+ <template #label>
+ 涓婄骇鑿滃崟
+ <el-tooltip content="鍒嗛厤鍒版寚瀹氳彍鍗曚笅锛屼緥濡� 绯荤粺绠＄悊" placement="top">
+ <el-icon><question-filled /></el-icon>
+ </el-tooltip>
+ </template>
+ <el-tree-select
+ v-model="info.parentMenuId"
+ :data="menuOptions"
+ :props="{ value: 'menuId', label: 'menuName', children: 'children' }"
+ value-key="menuId"
+ placeholder="璇烽�夋嫨绯荤粺鑿滃崟"
+ check-strictly
+ />
</el-form-item>
</el-col>
@@ -95,7 +107,7 @@
<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 +137,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 +155,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 +173,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 +197,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 +215,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="璇烽�夋嫨">
@@ -223,11 +235,11 @@
</template>
<script setup>
-import { listMenu } from "@/api/system/menu";
+import { listMenu } from "@/api/system/menu"
-const subColumns = ref([]);
-const menuOptions = ref({});
-const { proxy } = getCurrentInstance();
+const subColumns = ref([])
+const menuOptions = ref([])
+const { proxy } = getCurrentInstance()
const props = defineProps({
info: {
@@ -238,7 +250,7 @@
type: Array,
default: null
}
-});
+})
// 琛ㄥ崟鏍￠獙
const rules = ref({
@@ -247,35 +259,47 @@
moduleName: [{ required: true, message: "璇疯緭鍏ョ敓鎴愭ā鍧楀悕", trigger: "blur" }],
businessName: [{ required: true, message: "璇疯緭鍏ョ敓鎴愪笟鍔″悕", trigger: "blur" }],
functionName: [{ required: true, message: "璇疯緭鍏ョ敓鎴愬姛鑳藉悕", trigger: "blur" }]
-});
+})
+
function subSelectChange(value) {
- props.info.subTableFkName = "";
+ props.info.subTableFkName = ""
}
+
function tplSelectChange(value) {
if (value !== "sub") {
- props.info.subTableName = "";
- props.info.subTableFkName = "";
+ props.info.subTableName = ""
+ props.info.subTableFkName = ""
}
}
+
function setSubTableColumns(value) {
for (var item in props.tables) {
- const name = props.tables[item].tableName;
+ const name = props.tables[item].tableName
if (value === name) {
- subColumns.value = props.tables[item].columns;
- break;
+ subColumns.value = props.tables[item].columns
+ break
}
}
}
+
/** 鏌ヨ鑿滃崟涓嬫媺鏍戠粨鏋� */
function getMenuTreeselect() {
listMenu().then(response => {
- menuOptions.value = proxy.handleTree(response.data, "menuId");
- });
+ menuOptions.value = proxy.handleTree(response.data, "menuId")
+ })
}
-watch(() => props.info.subTableName, val => {
- setSubTableColumns(val);
-});
+onMounted(() => {
+ getMenuTreeselect()
+})
-getMenuTreeselect();
+watch(() => props.info.subTableName, val => {
+ setSubTableColumns(val)
+})
+
+watch(() => props.info.tplWebType, val => {
+ if (val === '') {
+ props.info.tplWebType = "element-plus"
+ }
+})
</script>
--
Gitblit v1.9.3