Merge pull request #123 from go-admin-team/dev

Dev

Author: wenjianzhang

Diff for: package.json

@@ -1,6 +1,6 @@
 {
   "name": "go-admin",
-  "version": "2.0.0-beta.6",
+  "version": "2.0.0-beta.7",
   "description": "A magical vue admin. An out-of-box UI solution for enterprise applications. Newest development stack of vue. Lots of awesome features",
   "author": "https://github.com/wenjianzhang",
   "license": "MIT",

Diff for: src/api/login.js

@@ -3,7 +3,7 @@ import request from '@/utils/request'
 // 获取验证码
 export function getCodeImg() {
   return request({
-    url: '/api/v1/getCaptcha',
+    url: '/api/v1/captcha',
     method: 'get'
   })
 }
@@ -15,12 +15,3 @@ export function getSetting() {
     method: 'get'
   })
 }
-
-// // 修改
-// export function updateSetting(data) {
-//   return request({
-//     url: '/api/v1/setting',
-//     method: 'post',
-//     data: data
-//   })
-// }

Diff for: src/views/admin/sys-config/index.vue

@@ -108,20 +108,15 @@
             <template slot-scope="scope">
               <el-popover trigger="hover" placement="top">
                 <p>键值: {{ scope.row.configValue }}</p>
-                <p>UI:  <el-tag v-if="scope.row.isFrontend=='0'">{{ scope.row.isFrontend }}</el-tag>
-                  <el-tag v-if="scope.row.isFrontend=='1'" type="success">{{ scope.row.isFrontend }}</el-tag>
-                  {{ scope.row.isFrontend }}</p>
+                <p>UI参数:  <el-tag v-if="scope.row.isFrontend=='2'">否</el-tag>
+                  <el-tag v-if="scope.row.isFrontend=='1'" type="success">是</el-tag>
+                </p>
                 <div slot="reference" class="name-wrapper">
                   {{ scope.row.configKey }}
                 </div>
               </el-popover>
             </template>
           </el-table-column>
-          <!-- <el-table-column
-            label="参数键值"
-            align="center"
-            prop="configValue"
-          /> -->
           <el-table-column
             label="内置"
             sortable="custom"

Diff for: src/views/dev-tools/gen/editTable.vue

@@ -46,16 +46,16 @@
             </template>
           </el-table-column>
 
-          <el-table-column label="插入" width="50">
+          <el-table-column label="编辑" width="50">
             <template slot-scope="scope">
               <el-checkbox v-model="scope.row.isInsert" true-label="1" false-label="0" />
             </template>
           </el-table-column>
-          <el-table-column label="编辑" width="70" :render-header="renderHeadeUpdate" :cell-style="{'text-align':'center'}">
+          <!-- <el-table-column label="编辑" width="70" :render-header="renderHeadeUpdate" :cell-style="{'text-align':'center'}">
             <template slot-scope="scope">
               <el-checkbox v-model="scope.row.isEdit" true-label="1" false-label="0" />
             </template>
-          </el-table-column>
+          </el-table-column> -->
           <el-table-column label="列表" width="70" :render-header="renderHeadeList" :cell-style="{'text-align':'center'}">
             <template slot-scope="scope">
               <el-checkbox v-model="scope.row.isList" true-label="1" false-label="0" />
@@ -91,7 +91,7 @@
                 <el-option label="文本框" value="input" />
                 <el-option label="下拉框" value="select" />
                 <el-option label="单选框" value="radio" />
-                <el-option label="文件选择" value="file" />
+                <!-- <el-option label="文件选择" value="file" /> -->
                 <!-- <el-option label="复选框" value="checkbox" />
                 <el-option label="日期控件" value="datetime" />-->
                 <el-option label="文本域" value="textarea" />

Diff for: src/views/dev-tools/gen/genInfoForm.vue

@@ -82,7 +82,6 @@
           <el-select v-model="info.isAuth">
             <el-option label="true" value="1" />
             <el-option label="false" value="2" />
-
           </el-select>
         </el-form-item>
       </el-col>
@@ -94,10 +93,9 @@
               <i class="el-icon-question" />
             </el-tooltip>
           </span>
-          <el-select v-model="info.isDataScope" disabled="">
+          <el-select v-model="info.isDataScope" disabled>
             <el-option label="true" value="1" />
             <el-option label="false" value="2" />
-
           </el-select>
         </el-form-item>
       </el-col>
@@ -109,10 +107,9 @@
               <i class="el-icon-question" />
             </el-tooltip>
           </span>
-          <el-select v-model="info.isActions">
-            <el-option label="true" value="1" />
+          <el-select v-model="info.isActions" disabled>
+            <!-- <el-option label="true" value="1" /> -->
             <el-option label="false" value="2" />
-
           </el-select>
         </el-form-item>
       </el-col>