From a681353fe1babd44562b60be0bbac70bfa7c2175 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期三, 12 七月 2023 10:48:33 +0800
Subject: [PATCH] fix 修复 解绑三方应用不刷新页面数据问题
---
src/views/tool/gen/genInfoForm.vue | 482 ++++++++++++++++++++++++++--------------------------
1 files changed, 242 insertions(+), 240 deletions(-)
diff --git a/src/views/tool/gen/genInfoForm.vue b/src/views/tool/gen/genInfoForm.vue
index b738de8..94486e2 100644
--- a/src/views/tool/gen/genInfoForm.vue
+++ b/src/views/tool/gen/genInfoForm.vue
@@ -1,9 +1,232 @@
+<template>
+ <el-form ref="genInfoForm" :model="infoForm" :rules="rules" label-width="150px">
+ <el-row>
+ <el-col :span="12">
+ <el-form-item prop="tplCategory">
+ <template #label>鐢熸垚妯℃澘</template>
+ <el-select v-model="infoForm.tplCategory" @change="tplSelectChange">
+ <el-option label="鍗曡〃锛堝鍒犳敼鏌ワ級" value="crud" />
+ <el-option label="鏍戣〃锛堝鍒犳敼鏌ワ級" value="tree" />
+ </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">
+ <el-icon><question-filled /></el-icon>
+ </el-tooltip>
+ </template>
+ <el-input v-model="infoForm.packageName" />
+ </el-form-item>
+ </el-col>
+
+ <el-col :span="12">
+ <el-form-item prop="moduleName">
+ <template #label>
+ 鐢熸垚妯″潡鍚�
+ <el-tooltip content="鍙悊瑙ｄ负瀛愮郴缁熷悕锛屼緥濡� system" placement="top">
+ <el-icon><question-filled /></el-icon>
+ </el-tooltip>
+ </template>
+ <el-input v-model="infoForm.moduleName" />
+ </el-form-item>
+ </el-col>
+
+ <el-col :span="12">
+ <el-form-item prop="businessName">
+ <template #label>
+ 鐢熸垚涓氬姟鍚�
+ <el-tooltip content="鍙悊瑙ｄ负鍔熻兘鑻辨枃鍚嶏紝渚嬪 user" placement="top">
+ <el-icon><question-filled /></el-icon>
+ </el-tooltip>
+ </template>
+ <el-input v-model="infoForm.businessName" />
+ </el-form-item>
+ </el-col>
+
+ <el-col :span="12">
+ <el-form-item prop="functionName">
+ <template #label>
+ 鐢熸垚鍔熻兘鍚�
+ <el-tooltip content="鐢ㄤ綔绫绘弿杩帮紝渚嬪 鐢ㄦ埛" placement="top">
+ <el-icon><question-filled /></el-icon>
+ </el-tooltip>
+ </template>
+ <el-input v-model="infoForm.functionName" />
+ </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="infoForm.parentMenuId"
+ :data="menuOptions"
+ :props="{ value: 'menuId', label: 'menuName', children: 'children' }"
+ value-key="menuId"
+ node-key="menuId"
+ placeholder="閫夋嫨涓婄骇鑿滃崟"
+ check-strictly
+ filterable
+ clearable
+ highlight-current
+ />
+ </el-form-item>
+ </el-col>
+
+ <el-col :span="12">
+ <el-form-item prop="genType">
+ <template #label>
+ 鐢熸垚浠ｇ爜鏂瑰紡
+ <el-tooltip content="榛樿涓簔ip鍘嬬缉鍖呬笅杞斤紝涔熷彲浠ヨ嚜瀹氫箟鐢熸垚璺緞" placement="top">
+ <el-icon><question-filled /></el-icon>
+ </el-tooltip>
+ </template>
+ <el-radio v-model="infoForm.genType" label="0">zip鍘嬬缉鍖�</el-radio>
+ <el-radio v-model="infoForm.genType" label="1">鑷畾涔夎矾寰�</el-radio>
+ </el-form-item>
+ </el-col>
+
+ <el-col :span="24" v-if="infoForm.genType == '1'">
+ <el-form-item prop="genPath">
+ <template #label>
+ 鑷畾涔夎矾寰�
+ <el-tooltip content="濉啓纾佺洏缁濆璺緞锛岃嫢涓嶅～鍐欙紝鍒欑敓鎴愬埌褰撳墠Web椤圭洰涓�" placement="top">
+ <el-icon><question-filled /></el-icon>
+ </el-tooltip>
+ </template>
+ <el-input v-model="infoForm.genPath">
+ <template #append>
+ <el-dropdown>
+ <el-button type="primary">
+ 鏈�杩戣矾寰勫揩閫熼�夋嫨
+ <i class="el-icon-arrow-down el-icon--right"></i>
+ </el-button>
+ <template #dropdown>
+ <el-dropdown-menu>
+ <el-dropdown-item @click="infoForm.genPath = '/'">鎭㈠榛樿鐨勭敓鎴愬熀纭�璺緞</el-dropdown-item>
+ </el-dropdown-menu>
+ </template>
+ </el-dropdown>
+ </template>
+ </el-input>
+ </el-form-item>
+ </el-col>
+ </el-row>
+
+ <template v-if="info.tplCategory == 'tree'">
+ <h4 class="form-header">鍏朵粬淇℃伅</h4>
+ <el-row v-show="info.tplCategory == 'tree'">
+ <el-col :span="12">
+ <el-form-item>
+ <template #label>
+ 鏍戠紪鐮佸瓧娈�
+ <el-tooltip content="鏍戞樉绀虹殑缂栫爜瀛楁鍚嶏紝 濡傦細dept_id" placement="top">
+ <el-icon><question-filled /></el-icon>
+ </el-tooltip>
+ </template>
+ <el-select v-model="infoForm.treeCode" placeholder="璇烽�夋嫨">
+ <el-option
+ v-for="(column, index) in info.columns"
+ :key="index"
+ :label="column.columnName + '锛�' + column.columnComment"
+ :value="column.columnName"
+ ></el-option>
+ </el-select>
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item>
+ <template #label>
+ 鏍戠埗缂栫爜瀛楁
+ <el-tooltip content="鏍戞樉绀虹殑鐖剁紪鐮佸瓧娈靛悕锛� 濡傦細parent_Id" placement="top">
+ <el-icon><question-filled /></el-icon>
+ </el-tooltip>
+ </template>
+ <el-select v-model="infoForm.treeParentCode" placeholder="璇烽�夋嫨">
+ <el-option
+ v-for="(column, index) in infoForm.columns"
+ :key="index"
+ :label="column.columnName + '锛�' + column.columnComment"
+ :value="column.columnName"
+ ></el-option>
+ </el-select>
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item>
+ <template #label>
+ 鏍戝悕绉板瓧娈�
+ <el-tooltip content="鏍戣妭鐐圭殑鏄剧ず鍚嶇О瀛楁鍚嶏紝 濡傦細dept_name" placement="top">
+ <el-icon><question-filled /></el-icon>
+ </el-tooltip>
+ </template>
+ <el-select v-model="infoForm.treeName" placeholder="璇烽�夋嫨">
+ <el-option
+ v-for="(column, index) in info.columns"
+ :key="index"
+ :label="column.columnName + '锛�' + column.columnComment"
+ :value="column.columnName"
+ ></el-option>
+ </el-select>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ </template>
+
+ <template v-if="info.tplCategory == 'sub'">
+ <h4 class="form-header">鍏宠仈淇℃伅</h4>
+ <el-row>
+ <el-col :span="12">
+ <el-form-item>
+ <template #label>
+ 鍏宠仈瀛愯〃鐨勮〃鍚�
+ <el-tooltip content="鍏宠仈瀛愯〃鐨勮〃鍚嶏紝 濡傦細sys_user" placement="top">
+ <el-icon><question-filled /></el-icon>
+ </el-tooltip>
+ </template>
+ <el-select v-model="infoForm.subTableName" placeholder="璇烽�夋嫨" @change="subSelectChange">
+ <el-option v-for="(t, index) in table" :key="index" :label="t.tableName + '锛�' + t.tableComment" :value="t.tableName"></el-option>
+ </el-select>
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item>
+ <template #label>
+ 瀛愯〃鍏宠仈鐨勫閿悕
+ <el-tooltip content="瀛愯〃鍏宠仈鐨勫閿悕锛� 濡傦細user_id" placement="top">
+ <el-icon><question-filled /></el-icon>
+ </el-tooltip>
+ </template>
+ <el-select v-model="infoForm.subTableFkName" placeholder="璇烽�夋嫨">
+ <el-option
+ v-for="(column, index) in subColumns"
+ :key="index"
+ :label="column.columnName + '锛�' + column.columnComment"
+ :value="column.columnName"
+ ></el-option>
+ </el-select>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ </template>
+ </el-form>
+</template>
+
<script setup lang="ts">
import { listMenu } from '@/api/system/menu';
-import { ComponentInternalInstance, PropType } from 'vue';
+import { propTypes } from "@/utils/propTypes";
interface MenuOptionsType {
- menuId: number;
+ menuId: number | string;
menuName: string;
children: MenuOptionsType[] | undefined;
}
@@ -13,14 +236,8 @@
const { proxy } = getCurrentInstance() as ComponentInternalInstance;
const props = defineProps({
- info: {
- type: Object as PropType<any>,
- default: null
- },
- tables: {
- type: Array as PropType<any[]>,
- default: null
- }
+ info: propTypes.any.def(null),
+ tables: propTypes.any.def(null)
});
const infoForm = computed(() => props.info);
@@ -41,25 +258,27 @@
const tplSelectChange = (value: string) => {
if (value !== "sub") {
infoForm.value.subTableName = "";
- infoForm.value.subTableFkName = "";
+ infoForm.value.subTableFkName = "";
}
}
const setSubTableColumns = (value: string) => {
- table.value.forEach(item => {
- const name = item.tableName;
- if (value === name) {
- subColumns.value = item.columns;
- return;
+ table.value.forEach((item: any) => {
+ const name = item.tableName;
+ if (value === name) {
+ subColumns.value = item.columns;
+ return;
}
- })
+ })
}
+
/** 鏌ヨ鑿滃崟涓嬫媺鏍戠粨鏋� */
const getMenuTreeselect = async () => {
- const res = await listMenu();
- const data = proxy?.handleTree<MenuOptionsType>(res.data, "menuId");
- if (data) {
- menuOptions.value = data
- }
+ const res = await listMenu();
+ res.data.forEach(m => m.menuId = m.menuId.toString());
+ const data = proxy?.handleTree<MenuOptionsType>(res.data, "menuId");
+ if (data) {
+ menuOptions.value = data
+ }
}
watch(() => props.info.subTableName, val => {
@@ -67,223 +286,6 @@
});
onMounted(() => {
- getMenuTreeselect();
+ getMenuTreeselect();
})
</script>
-
-<template>
- <el-form ref="genInfoForm" :model="infoForm" :rules="rules" label-width="150px">
- <el-row>
- <el-col :span="12">
- <el-form-item prop="tplCategory">
- <template #label>鐢熸垚妯℃澘</template>
- <el-select v-model="infoForm.tplCategory" @change="tplSelectChange">
- <el-option label="鍗曡〃锛堝鍒犳敼鏌ワ級" value="crud" />
- <el-option label="鏍戣〃锛堝鍒犳敼鏌ワ級" value="tree" />
- </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">
- <el-icon><question-filled /></el-icon>
- </el-tooltip>
- </template>
- <el-input v-model="infoForm.packageName" />
- </el-form-item>
- </el-col>
-
- <el-col :span="12">
- <el-form-item prop="moduleName">
- <template #label>
- 鐢熸垚妯″潡鍚�
- <el-tooltip content="鍙悊瑙ｄ负瀛愮郴缁熷悕锛屼緥濡� system" placement="top">
- <el-icon><question-filled /></el-icon>
- </el-tooltip>
- </template>
- <el-input v-model="infoForm.moduleName" />
- </el-form-item>
- </el-col>
-
- <el-col :span="12">
- <el-form-item prop="businessName">
- <template #label>
- 鐢熸垚涓氬姟鍚�
- <el-tooltip content="鍙悊瑙ｄ负鍔熻兘鑻辨枃鍚嶏紝渚嬪 user" placement="top">
- <el-icon><question-filled /></el-icon>
- </el-tooltip>
- </template>
- <el-input v-model="infoForm.businessName" />
- </el-form-item>
- </el-col>
-
- <el-col :span="12">
- <el-form-item prop="functionName">
- <template #label>
- 鐢熸垚鍔熻兘鍚�
- <el-tooltip content="鐢ㄤ綔绫绘弿杩帮紝渚嬪 鐢ㄦ埛" placement="top">
- <el-icon><question-filled /></el-icon>
- </el-tooltip>
- </template>
- <el-input v-model="infoForm.functionName" />
- </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>
- <tree-select
- v-model:value="infoForm.parentMenuId"
- :options="menuOptions"
- :objMap="{ value: 'menuId', label: 'menuName', children: 'children' }"
- placeholder="璇烽�夋嫨绯荤粺鑿滃崟"
- />
- </el-form-item>
- </el-col>
-
- <el-col :span="12">
- <el-form-item prop="genType">
- <template #label>
- 鐢熸垚浠ｇ爜鏂瑰紡
- <el-tooltip content="榛樿涓簔ip鍘嬬缉鍖呬笅杞斤紝涔熷彲浠ヨ嚜瀹氫箟鐢熸垚璺緞" placement="top">
- <el-icon><question-filled /></el-icon>
- </el-tooltip>
- </template>
- <el-radio v-model="infoForm.genType" label="0">zip鍘嬬缉鍖�</el-radio>
- <el-radio v-model="infoForm.genType" label="1">鑷畾涔夎矾寰�</el-radio>
- </el-form-item>
- </el-col>
-
- <el-col :span="24" v-if="infoForm.genType == '1'">
- <el-form-item prop="genPath">
- <template #label>
- 鑷畾涔夎矾寰�
- <el-tooltip content="濉啓纾佺洏缁濆璺緞锛岃嫢涓嶅～鍐欙紝鍒欑敓鎴愬埌褰撳墠Web椤圭洰涓�" placement="top">
- <el-icon><question-filled /></el-icon>
- </el-tooltip>
- </template>
- <el-input v-model="infoForm.genPath">
- <template #append>
- <el-dropdown>
- <el-button type="primary">
- 鏈�杩戣矾寰勫揩閫熼�夋嫨
- <i class="el-icon-arrow-down el-icon--right"></i>
- </el-button>
- <template #dropdown>
- <el-dropdown-menu>
- <el-dropdown-item @click="infoForm.genPath = '/'">鎭㈠榛樿鐨勭敓鎴愬熀纭�璺緞</el-dropdown-item>
- </el-dropdown-menu>
- </template>
- </el-dropdown>
- </template>
- </el-input>
- </el-form-item>
- </el-col>
- </el-row>
-
- <template v-if="info.tplCategory == 'tree'">
- <h4 class="form-header">鍏朵粬淇℃伅</h4>
- <el-row v-show="info.tplCategory == 'tree'">
- <el-col :span="12">
- <el-form-item>
- <template #label>
- 鏍戠紪鐮佸瓧娈�
- <el-tooltip content="鏍戞樉绀虹殑缂栫爜瀛楁鍚嶏紝 濡傦細dept_id" placement="top">
- <el-icon><question-filled /></el-icon>
- </el-tooltip>
- </template>
- <el-select v-model="infoForm.treeCode" placeholder="璇烽�夋嫨">
- <el-option
- v-for="(column, index) in info.columns"
- :key="index"
- :label="column.columnName + '锛�' + column.columnComment"
- :value="column.columnName"
- ></el-option>
- </el-select>
- </el-form-item>
- </el-col>
- <el-col :span="12">
- <el-form-item>
- <template #label>
- 鏍戠埗缂栫爜瀛楁
- <el-tooltip content="鏍戞樉绀虹殑鐖剁紪鐮佸瓧娈靛悕锛� 濡傦細parent_Id" placement="top">
- <el-icon><question-filled /></el-icon>
- </el-tooltip>
- </template>
- <el-select v-model="infoForm.treeParentCode" placeholder="璇烽�夋嫨">
- <el-option
- v-for="(column, index) in infoForm.columns"
- :key="index"
- :label="column.columnName + '锛�' + column.columnComment"
- :value="column.columnName"
- ></el-option>
- </el-select>
- </el-form-item>
- </el-col>
- <el-col :span="12">
- <el-form-item>
- <template #label>
- 鏍戝悕绉板瓧娈�
- <el-tooltip content="鏍戣妭鐐圭殑鏄剧ず鍚嶇О瀛楁鍚嶏紝 濡傦細dept_name" placement="top">
- <el-icon><question-filled /></el-icon>
- </el-tooltip>
- </template>
- <el-select v-model="infoForm.treeName" placeholder="璇烽�夋嫨">
- <el-option
- v-for="(column, index) in info.columns"
- :key="index"
- :label="column.columnName + '锛�' + column.columnComment"
- :value="column.columnName"
- ></el-option>
- </el-select>
- </el-form-item>
- </el-col>
- </el-row>
- </template>
-
- <template v-if="info.tplCategory == 'sub'">
- <h4 class="form-header">鍏宠仈淇℃伅</h4>
- <el-row>
- <el-col :span="12">
- <el-form-item>
- <template #label>
- 鍏宠仈瀛愯〃鐨勮〃鍚�
- <el-tooltip content="鍏宠仈瀛愯〃鐨勮〃鍚嶏紝 濡傦細sys_user" placement="top">
- <el-icon><question-filled /></el-icon>
- </el-tooltip>
- </template>
- <el-select v-model="infoForm.subTableName" placeholder="璇烽�夋嫨" @change="subSelectChange">
- <el-option v-for="(t, index) in table" :key="index" :label="t.tableName + '锛�' + t.tableComment" :value="t.tableName"></el-option>
- </el-select>
- </el-form-item>
- </el-col>
- <el-col :span="12">
- <el-form-item>
- <template #label>
- 瀛愯〃鍏宠仈鐨勫閿悕
- <el-tooltip content="瀛愯〃鍏宠仈鐨勫閿悕锛� 濡傦細user_id" placement="top">
- <el-icon><question-filled /></el-icon>
- </el-tooltip>
- </template>
- <el-select v-model="infoForm.subTableFkName" placeholder="璇烽�夋嫨">
- <el-option
- v-for="(column, index) in subColumns"
- :key="index"
- :label="column.columnName + '锛�' + column.columnComment"
- :value="column.columnName"
- ></el-option>
- </el-select>
- </el-form-item>
- </el-col>
- </el-row>
- </template>
- </el-form>
-</template>
--
Gitblit v1.9.3