From 5e64a93d115cfc65ef76eb0e4612d9a313448e29 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: 星期二, 25 五月 2021 09:37:55 +0800
Subject: [PATCH] 若依 3.5.0

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

diff --git a/ruoyi-ui/src/views/tool/gen/editTable.vue b/ruoyi-ui/src/views/tool/gen/editTable.vue
index fea958e..3907189 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>
@@ -112,7 +113,7 @@
         </el-table>
       </el-tab-pane>
       <el-tab-pane label="鐢熸垚淇℃伅" name="genInfo">
-        <gen-info-form ref="genInfo" :info="info" :menus="menus"/>
+        <gen-info-form ref="genInfo" :info="info" :tables="tables" :menus="menus"/>
       </el-tab-pane>
     </el-tabs>
     <el-form label-width="100px">
@@ -143,6 +144,8 @@
       activeName: "cloum",
       // 琛ㄦ牸鐨勯珮搴�
       tableHeight: document.documentElement.scrollHeight - 245 + "px",
+      // 琛ㄤ俊鎭�
+      tables: [],
       // 琛ㄥ垪淇℃伅
       cloumns: [],
       // 瀛楀吀淇℃伅
@@ -160,6 +163,7 @@
       getGenTable(tableId).then(res => {
         this.cloumns = res.data.rows;
         this.info = res.data.info;
+        this.tables = res.data.tables;
       });
       /** 鏌ヨ瀛楀吀涓嬫媺鍒楄〃 */
       getDictOptionselect().then(response => {

--
Gitblit v1.9.3