zhangwenjian 5 years ago
parent
commit
94dc03f138

+ 11 - 0
src/App.vue

@@ -8,4 +8,15 @@
 export default {
   name: 'App'
 }
+
+</script>
+<script>
+var _hmt = _hmt || [];
+(function() {
+  var hm = document.createElement("script");
+  hm.src = "https://hm.baidu.com/hm.js?1d2d61263f13e4b288c8da19ad3ff56d";
+  var s = document.getElementsByTagName("script")[0];
+  s.parentNode.insertBefore(hm, s);
+})();
 </script>
+

+ 1 - 1
src/api/tools/gen.js

@@ -45,7 +45,7 @@ export function importTable(data) {
 // 预览生成代码
 export function previewTable(tableId) {
   return request({
-    url: '/tool/gen/preview/' + tableId,
+    url: '/api/v1/gen/preview/' + tableId,
     method: 'get'
   })
 }

+ 1 - 1
src/views/login/index.vue

@@ -60,7 +60,7 @@
           @keyup.enter.native="handleLogin"
         />
       </el-form-item>
-      <div class="login-code" style=" width: 38%;height: 48px;float: right;">
+      <div class="login-code" style=" width: 38%;height: 48px;float: right;background-color: darkgray;">
         <img style="height: 48px;width: 100%;" :src="codeUrl" @click="getCode">
       </div>
 

+ 9 - 1
src/views/tools/gen/basicInfoForm.vue

@@ -23,11 +23,19 @@
         </el-form-item>
       </el-col>
       <el-col :span="12">
-        <el-form-item label="是否逻辑删除" prop="isLogicalDelete">
+        <el-form-item prop="isLogicalDelete">
+          <span slot="label">
+            是否逻辑删除
+            <el-tooltip content="目前只支持逻辑删除" placement="top">
+              <i class="el-icon-question" />
+            </el-tooltip>
+          </span>
+
           <el-radio-group v-model="info.isLogicalDelete">
             <el-radio label="1">是</el-radio>
             <el-radio label="0">否</el-radio>
           </el-radio-group>
+
         </el-form-item>
       </el-col>
       <el-col :span="12">

+ 8 - 8
src/views/tools/gen/editTable.vue

@@ -30,8 +30,8 @@
               <el-select v-model="scope.row.goType">
                 <el-option label="int64" value="int64" />
                 <el-option label="string" value="string" />
-                <el-option label="int" value="int" />
-                <el-option label="bool" value="bool" />
+                <!-- <el-option label="int" value="int" />
+                <el-option label="bool" value="bool" /> -->
               </el-select>
             </template>
           </el-table-column>
@@ -70,13 +70,13 @@
             <template slot-scope="scope">
               <el-select v-model="scope.row.queryType">
                 <el-option label="=" value="EQ" />
-                <el-option label="!=" value="NE" />
+                <!-- <el-option label="!=" value="NE" />
                 <el-option label=">" value="GT" />
                 <el-option label=">=" value="GTE" />
                 <el-option label="<" value="LT" />
                 <el-option label="<=" value="LTE" />
                 <el-option label="LIKE" value="LIKE" />
-                <el-option label="BETWEEN" value="BETWEEN" />
+                <el-option label="BETWEEN" value="BETWEEN" /> -->
               </el-select>
             </template>
           </el-table-column>
@@ -89,15 +89,15 @@
             <template slot-scope="scope">
               <el-select v-model="scope.row.htmlType">
                 <el-option label="文本框" value="input" />
-                <el-option label="文本域" value="textarea" />
+                <!-- <el-option label="文本域" value="textarea" />
                 <el-option label="下拉框" value="select" />
                 <el-option label="单选框" value="radio" />
                 <el-option label="复选框" value="checkbox" />
-                <el-option label="日期控件" value="datetime" />
+                <el-option label="日期控件" value="datetime" /> -->
               </el-select>
             </template>
           </el-table-column>
-          <el-table-column label="字典类型" width="160">
+          <!-- <el-table-column label="字典类型" width="160">
             <template slot-scope="scope">
               <el-select v-model="scope.row.dictType" clearable filterable placeholder="请选择">
                 <el-option
@@ -111,7 +111,7 @@
                 </el-option>
               </el-select>
             </template>
-          </el-table-column>
+          </el-table-column> -->
         </el-table>
       </el-tab-pane>
       <el-tab-pane label="生成信息" name="genInfo">

+ 2 - 2
src/views/tools/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>
@@ -15,7 +15,7 @@
         <el-form-item prop="packageName">
           <span slot="label">
             生成包路径
-            <el-tooltip content="生成在哪个java包下,例如 com.ruoyi.system" placement="top">
+            <el-tooltip content="文件夹路径名,例如 user" placement="top">
               <i class="el-icon-question" />
             </el-tooltip>
           </span>

+ 6 - 7
src/views/tools/gen/index.vue

@@ -39,13 +39,12 @@
 
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
-        <el-button
-
+        <!-- <el-button
           type="primary"
           icon="el-icon-download"
           size="mini"
           @click="handleGenTable"
-        >生成</el-button>
+        >生成</el-button> -->
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -127,13 +126,13 @@
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
           >删除</el-button>
-          <el-button
+          <!-- <el-button
 
             type="text"
             size="small"
             icon="el-icon-download"
             @click="handleGenTable(scope.row)"
-          >生成代码</el-button>
+          >生成代码</el-button> -->
         </template>
       </el-table-column>
     </el-table>
@@ -150,8 +149,8 @@
         <el-tab-pane
           v-for="(value, key) in preview.data"
           :key="key"
-          :label="key.substring(key.lastIndexOf('/')+1,key.indexOf('.vm'))"
-          :name="key.substring(key.lastIndexOf('/')+1,key.indexOf('.vm'))"
+          :label="key.substring(key.lastIndexOf('/')+1,key.indexOf('.template'))"
+          :name="key.substring(key.lastIndexOf('/')+1,key.indexOf('.template'))"
         >
           <pre>{{ value }}</pre>
         </el-tab-pane>