From b36874538051c56d9c76485d4485f7b3c164aad3 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期三, 06 一月 2021 09:35:00 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue

---
 ruoyi-ui/src/views/tool/gen/editTable.vue |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/ruoyi-ui/src/views/tool/gen/editTable.vue b/ruoyi-ui/src/views/tool/gen/editTable.vue
index db1c31d..62a8314 100644
--- a/ruoyi-ui/src/views/tool/gen/editTable.vue
+++ b/ruoyi-ui/src/views/tool/gen/editTable.vue
@@ -90,7 +90,8 @@
                 <el-option label="鍗曢�夋" value="radio" />
                 <el-option label="澶嶉�夋" value="checkbox" />
                 <el-option label="鏃ユ湡鎺т欢" value="datetime" />
-                <el-option label="涓婁紶鎺т欢" value="uploadImage" />
+                <el-option label="鍥剧墖涓婁紶" value="imageUpload" />
+                <el-option label="鏂囦欢涓婁紶" value="fileUpload" />
                 <el-option label="瀵屾枃鏈帶浠�" value="editor" />
               </el-select>
             </template>
@@ -127,7 +128,6 @@
 import { getGenTable, updateGenTable } from "@/api/tool/gen";
 import { optionselect as getDictOptionselect } from "@/api/system/dict/type";
 import { listMenu as getMenuTreeselect } from "@/api/system/menu";
-import Global from "@/layout/components/global.js";
 import basicInfoForm from "./basicInfoForm";
 import genInfoForm from "./genInfoForm";
 import Sortable from 'sortablejs'
@@ -208,7 +208,6 @@
     },
     /** 鍏抽棴鎸夐挳 */
     close() {
-      Global.$emit("removeCache", "closeSelectedTag", this.$route);
       this.$store.dispatch("tagsView/delView", this.$route);
       this.$router.push({ path: "/tool/gen", query: { t: Date.now()}})
     }

--
Gitblit v1.9.3