From c966d9bada8e189f0beb4867fce81ae73f3fcebd Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期日, 02 八月 2020 18:31:47 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
---
ruoyi-ui/src/views/tool/gen/genInfoForm.vue | 50 ++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 46 insertions(+), 4 deletions(-)
diff --git a/ruoyi-ui/src/views/tool/gen/genInfoForm.vue b/ruoyi-ui/src/views/tool/gen/genInfoForm.vue
index c23e7e0..bd4a2d8 100644
--- a/ruoyi-ui/src/views/tool/gen/genInfoForm.vue
+++ b/ruoyi-ui/src/views/tool/gen/genInfoForm.vue
@@ -6,7 +6,7 @@
<span slot="label">鐢熸垚妯℃澘</span>
<el-select v-model="info.tplCategory">
<el-option label="鍗曡〃锛堝鍒犳敼鏌ワ級" value="crud" />
- <el-option label="鏍戣〃锛堝鍒犳敼鏌ワ級" value="tree"/>
+ <el-option label="鏍戣〃锛堝鍒犳敼鏌ワ級" value="tree" />
</el-select>
</el-form-item>
</el-col>
@@ -60,14 +60,56 @@
</el-col>
<el-col :span="12">
- <el-form-item prop="functionName">
+ <el-form-item>
<span slot="label">
涓婄骇鑿滃崟
<el-tooltip content="鍒嗛厤鍒版寚瀹氳彍鍗曚笅锛屼緥濡� 绯荤粺绠＄悊" placement="top">
<i class="el-icon-question"></i>
</el-tooltip>
</span>
- <treeselect :append-to-body="true" v-model="info.parentMenuId" :options="menus" :normalizer="normalizer" :show-count="true" placeholder="璇烽�夋嫨绯荤粺鑿滃崟"/>
+ <treeselect
+ :append-to-body="true"
+ v-model="info.parentMenuId"
+ :options="menus"
+ :normalizer="normalizer"
+ :show-count="true"
+ placeholder="璇烽�夋嫨绯荤粺鑿滃崟"
+ />
+ </el-form-item>
+ </el-col>
+
+ <el-col :span="12">
+ <el-form-item prop="genType">
+ <span slot="label">
+ 鐢熸垚浠ｇ爜鏂瑰紡
+ <el-tooltip content="榛樿涓簔ip鍘嬬缉鍖呬笅杞斤紝涔熷彲浠ヨ嚜瀹氫箟鐢熸垚璺緞" placement="top">
+ <i class="el-icon-question"></i>
+ </el-tooltip>
+ </span>
+ <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">
+ <span slot="label">
+ 鑷畾涔夎矾寰�
+ <el-tooltip content="濉啓纾佺洏缁濆璺緞锛岃嫢涓嶅～鍐欙紝鍒欑敓鎴愬埌褰撳墠Web椤圭洰涓�" placement="top">
+ <i class="el-icon-question"></i>
+ </el-tooltip>
+ </span>
+ <el-input v-model="info.genPath">
+ <el-dropdown slot="append">
+ <el-button type="primary">
+ 鏈�杩戣矾寰勫揩閫熼�夋嫨
+ <i class="el-icon-arrow-down el-icon--right"></i>
+ </el-button>
+ <el-dropdown-menu slot="dropdown">
+ <el-dropdown-item @click.native="info.genPath = '/'">鎭㈠榛樿鐨勭敓鎴愬熀纭�璺緞</el-dropdown-item>
+ </el-dropdown-menu>
+ </el-dropdown>
+ </el-input>
</el-form-item>
</el-col>
</el-row>
@@ -165,7 +207,7 @@
],
functionName: [
{ required: true, message: "璇疯緭鍏ョ敓鎴愬姛鑳藉悕", trigger: "blur" }
- ]
+ ],
}
};
},
--
Gitblit v1.9.3