show base work dir in page

src/model/request.go

@@ -24,6 +24,7 @@ type ResData struct {
 	Data  interface{} `json:"data"`
 	Model interface{} `json:"model"`
 	Res   interface{} `json:"res"`
+	WorkDir   string `json:"workDir"`
 
 	Total int `json:"total"`
 }

src/zd.go

@@ -373,10 +373,8 @@ func (s *Server) admin(writer http.ResponseWriter, req *http.Request) {
 	case "listDef":
 		ret.Data, ret.Total = s.defService.List(reqData.Keywords, reqData.Page)
 	case "getDef":
-		var def model.ZdDef
-		def, ret.Res = s.defService.Get(reqData.Id)
-
-		ret.Data = def
+		ret.Data, ret.Res = s.defService.Get(reqData.Id)
+		ret.WorkDir = vari.WorkDir
 	case "saveDef":
 		def := serverUtils.ConvertDef(reqData.Data)
 		s.defService.Save(&def)
@@ -452,6 +450,7 @@ func (s *Server) admin(writer http.ResponseWriter, req *http.Request) {
 		ret.Data, ret.Total = s.rangesService.List(reqData.Keywords, reqData.Page)
 	case "getRanges":
 		ret.Data, ret.Res = s.rangesService.Get(reqData.Id)
+		ret.WorkDir = vari.WorkDir
 	case "saveRanges":
 		ranges := serverUtils.ConvertRanges(reqData.Data)
 		ret.Data = s.rangesService.Save(&ranges)
@@ -480,6 +479,7 @@ func (s *Server) admin(writer http.ResponseWriter, req *http.Request) {
 		ret.Data, ret.Total = s.instancesService.List(reqData.Keywords, reqData.Page)
 	case "getInstances":
 		ret.Data, ret.Res = s.instancesService.Get(reqData.Id)
+		ret.WorkDir = vari.WorkDir
 	case "saveInstances":
 		ranges := serverUtils.ConvertInstances(reqData.Data)
 		ret.Data = s.instancesService.Save(&ranges)
@@ -507,6 +507,7 @@ func (s *Server) admin(writer http.ResponseWriter, req *http.Request) {
 		ret.Data, ret.Total = s.excelService.List(reqData.Keywords, reqData.Page)
 	case "getExcel":
 		ret.Data, ret.Res = s.excelService.Get(reqData.Id)
+		ret.WorkDir = vari.WorkDir
 	case "saveExcel":
 		ranges := serverUtils.ConvertExcel(reqData.Data)
 		ret.Data = s.excelService.Save(&ranges)
@@ -517,6 +518,7 @@ func (s *Server) admin(writer http.ResponseWriter, req *http.Request) {
 		ret.Data, ret.Total = s.textService.List(reqData.Keywords, reqData.Page)
 	case "getText":
 		ret.Data, ret.Res = s.textService.Get(reqData.Id)
+		ret.WorkDir = vari.WorkDir
 	case "saveText":
 		ranges := serverUtils.ConvertText(reqData.Data)
 		ret.Data = s.textService.Save(&ranges)
@@ -527,6 +529,7 @@ func (s *Server) admin(writer http.ResponseWriter, req *http.Request) {
 		ret.Data, ret.Total = s.configService.List(reqData.Keywords, reqData.Page)
 	case "getConfig":
 		ret.Data, ret.Res = s.configService.Get(reqData.Id)
+		ret.WorkDir = vari.WorkDir
 	case "saveConfig":
 		ranges := serverUtils.ConvertConfig(reqData.Data)
 		ret.Data = s.configService.Save(&ranges)

ui/src/layout/Zui.less

@@ -2,6 +2,9 @@
   .ant-row.ant-form-item {
     margin-bottom: 0 !important;
   }
+  &.zui-input-with-tips {
+    margin-bottom: 8px !important;
+  }
 
   .zui-input-group-addon {
     display: inline-block;
@@ -17,4 +20,10 @@
       line-height: 32px;
     }
   }
+
+  .zui-input-tips {
+    display: inline-block;
+    padding-top: 5px;
+    line-height: 18px;
+  }
 }

ui/src/router/index.js

@@ -82,12 +82,11 @@ const routes = [
                                 children: [
                                     {
                                         path: 'list',
-                                        alias: "index",
                                         name: 'excel-list',
                                         component: () => import('../views/data/buildin/excel/List')
                                     },
                                     {
-                                        path: 'excel/:id',
+                                        path: 'edit/:id',
                                         name: 'excel-edit',
                                         component: () => import('../views/data/buildin/excel/Edit')
                                     },

ui/src/views/data/buildin/config/Edit.vue

@@ -19,17 +19,23 @@
         </a-row>
 
         <a-row :gutter="colsFull">
-          <a-form-model-item label="目录" prop="folder" :labelCol="labelColFull" :wrapperCol="wrapperColFull">
-            <a-input v-model="model.folder">
-              <a-select
-                  slot="addonAfter"
-                  v-model="model.folder"
-                  style="width: 400px"
-                  placeholder="请选择">
-                <a-select-option v-for="(item, index) in dirs" :value="item.name" :title="item.name" :key="index">
+          <a-form-model-item label="目录" prop="folder" class="zui-input-group zui-input-with-tips"
+                             :labelCol="labelColFull" :wrapperCol="wrapperColFull">
+            <a-form-model-item prop="folder" :style="{ display: 'inline-block', width: 'calc(70% - 30px)' }">
+              <a-select v-model="model.folder" placeholder="请选择">
+                <a-select-option v-for="(item, index) in dirs" :value="item.name" :key="index">
                   {{item.name}}</a-select-option>
               </a-select>
-            </a-input>
+              <span class="zui-input-tips">工作目录：{{workDir}}</span>
+            </a-form-model-item>
+
+            <span class="zui-input-group-addon" :style="{ width: '60px' }">
+              <span>子目录</span>
+            </span>
+
+            <a-form-model-item :style="{ display: 'inline-block', width: 'calc(30% - 30px)' }">
+              <a-input v-model="model.subFolder"></a-input>
+            </a-form-model-item>
           </a-form-model-item>
         </a-row>
 
@@ -141,6 +147,7 @@ export default {
       id: 0,
       model: { folder: 'yaml/'},
       dirs: [],
+      workDir: '',
     };
   },
 
@@ -160,6 +167,7 @@ export default {
         console.log('getConfig', json)
         this.model = json.data
         this.dirs = json.res
+        this.workDir = json.workDir
       })
     },
     save() {

ui/src/views/data/buildin/excel/Edit.vue

@@ -2,7 +2,7 @@
   <div>
     <div class="head">
       <div class="title">
-        文本<span v-if="id!=0">编辑</span><span v-if="id==0">新建</span>
+        表格<span v-if="id!=0">编辑</span><span v-if="id==0">新建</span>
       </div>
       <div class="filter"></div>
       <div class="buttons">
@@ -19,17 +19,23 @@
         </a-row>
 
         <a-row :gutter="colsFull">
-          <a-form-model-item label="目录" prop="folder" :labelCol="labelColFull" :wrapperCol="wrapperColFull">
-            <a-input v-model="model.folder">
-              <a-select
-                  slot="addonAfter"
-                  v-model="model.folder"
-                  style="width: 400px"
-                  placeholder="请选择">
+          <a-form-model-item label="目录" prop="folder" class="zui-input-group zui-input-with-tips"
+                             :labelCol="labelColFull" :wrapperCol="wrapperColFull">
+            <a-form-model-item prop="folder" :style="{ display: 'inline-block', width: 'calc(70% - 30px)' }">
+              <a-select v-model="model.folder" placeholder="请选择">
                 <a-select-option v-for="(item, index) in dirs" :value="item.name" :key="index">
                   {{item.name}}</a-select-option>
               </a-select>
-            </a-input>
+              <span class="zui-input-tips">工作目录：{{workDir}}</span>
+            </a-form-model-item>
+
+            <span class="zui-input-group-addon" :style="{ width: '60px' }">
+              <span>子目录</span>
+            </span>
+
+            <a-form-model-item :style="{ display: 'inline-block', width: 'calc(30% - 30px)' }">
+              <a-input v-model="model.subFolder"></a-input>
+            </a-form-model-item>
           </a-form-model-item>
         </a-row>
 
@@ -80,6 +86,7 @@ export default {
       id: 0,
       model: { folder: 'data/'},
       dirs: [],
+      workDir: '',
     };
   },
 
@@ -101,6 +108,7 @@ export default {
         console.log('getText', json)
         this.model = json.data
         this.dirs = json.res
+        this.workDir = json.workDir
       })
     },
     save() {

ui/src/views/data/buildin/instances/Edit.vue

@@ -19,17 +19,23 @@
         </a-row>
 
         <a-row :gutter="colsFull">
-          <a-form-model-item label="目录" prop="folder" :labelCol="labelColFull" :wrapperCol="wrapperColFull">
-            <a-input v-model="model.folder">
-              <a-select
-                  slot="addonAfter"
-                  v-model="model.folder"
-                  style="width: 400px"
-                  placeholder="请选择">
+          <a-form-model-item label="目录" prop="folder" class="zui-input-group zui-input-with-tips"
+                             :labelCol="labelColFull" :wrapperCol="wrapperColFull">
+            <a-form-model-item prop="folder" :style="{ display: 'inline-block', width: 'calc(70% - 30px)' }">
+              <a-select v-model="model.folder" placeholder="请选择">
                 <a-select-option v-for="(item, index) in dirs" :value="item.name" :key="index">
                   {{item.name}}</a-select-option>
               </a-select>
-            </a-input>
+              <span class="zui-input-tips">工作目录：{{workDir}}</span>
+            </a-form-model-item>
+
+            <span class="zui-input-group-addon" :style="{ width: '60px' }">
+              <span>子目录</span>
+            </span>
+
+            <a-form-model-item :style="{ display: 'inline-block', width: 'calc(30% - 30px)' }">
+              <a-input v-model="model.subFolder"></a-input>
+            </a-form-model-item>
           </a-form-model-item>
         </a-row>
 
@@ -119,6 +125,7 @@ export default {
       id: 0,
       model: {folder: 'yaml/'},
       dirs: [],
+      workDir: '',
     };
   },
 
@@ -140,6 +147,7 @@ export default {
         console.log('getInstances', json)
         this.model = json.data
         this.dirs = json.res
+        this.workDir = json.workDir
       })
     },
     save() {

ui/src/views/data/buildin/ranges/Edit.vue

@@ -19,17 +19,23 @@
         </a-row>
 
         <a-row :gutter="colsFull">
-          <a-form-model-item label="目录" prop="folder" :labelCol="labelColFull" :wrapperCol="wrapperColFull">
-            <a-input v-model="model.folder">
-              <a-select
-                  slot="addonAfter"
-                  v-model="model.folder"
-                  style="width: 400px"
-                  placeholder="请选择">
+          <a-form-model-item label="目录" prop="folder" class="zui-input-group zui-input-with-tips"
+                             :labelCol="labelColFull" :wrapperCol="wrapperColFull">
+            <a-form-model-item prop="folder" :style="{ display: 'inline-block', width: 'calc(70% - 30px)' }">
+              <a-select v-model="model.folder" placeholder="请选择">
                 <a-select-option v-for="(item, index) in dirs" :value="item.name" :key="index">
                   {{item.name}}</a-select-option>
               </a-select>
-            </a-input>
+              <span class="zui-input-tips">工作目录：{{workDir}}</span>
+            </a-form-model-item>
+
+            <span class="zui-input-group-addon" :style="{ width: '60px' }">
+              <span>子目录</span>
+            </span>
+
+            <a-form-model-item :style="{ display: 'inline-block', width: 'calc(30% - 30px)' }">
+              <a-input v-model="model.subFolder"></a-input>
+            </a-form-model-item>
           </a-form-model-item>
         </a-row>
 
@@ -119,6 +125,7 @@ export default {
       id: 0,
       model: {folder: 'yaml/'},
       dirs: [],
+      workDir: '',
     };
   },
 
@@ -140,6 +147,7 @@ export default {
         console.log('getRanges', json)
         this.model = json.data
         this.dirs = json.res
+        this.workDir = json.workDir
       })
     },
     save() {

ui/src/views/data/buildin/text/Edit.vue

@@ -19,17 +19,23 @@
         </a-row>
 
         <a-row :gutter="colsFull">
-          <a-form-model-item label="目录" prop="folder" :labelCol="labelColFull" :wrapperCol="wrapperColFull">
-            <a-input v-model="model.folder">
-              <a-select
-                  slot="addonAfter"
-                  v-model="model.folder"
-                  style="width: 400px"
-                  placeholder="请选择">
+          <a-form-model-item label="目录" prop="folder" class="zui-input-group zui-input-with-tips"
+                             :labelCol="labelColFull" :wrapperCol="wrapperColFull">
+            <a-form-model-item prop="folder" :style="{ display: 'inline-block', width: 'calc(70% - 30px)' }">
+              <a-select v-model="model.folder" placeholder="请选择">
                 <a-select-option v-for="(item, index) in dirs" :value="item.name" :key="index">
                   {{item.name}}</a-select-option>
               </a-select>
-            </a-input>
+              <span class="zui-input-tips">工作目录：{{workDir}}</span>
+            </a-form-model-item>
+
+            <span class="zui-input-group-addon" :style="{ width: '60px' }">
+              <span>子目录</span>
+            </span>
+
+            <a-form-model-item :style="{ display: 'inline-block', width: 'calc(30% - 30px)' }">
+              <a-input v-model="model.subFolder"></a-input>
+            </a-form-model-item>
           </a-form-model-item>
         </a-row>
 
@@ -86,6 +92,7 @@ export default {
       id: 0,
       model: {folder: 'yaml/'},
       dirs: [],
+      workDir: '',
     };
   },
 
@@ -107,6 +114,7 @@ export default {
         console.log('getText', json)
         this.model = json.data
         this.dirs = json.res
+        this.workDir = json.workDir
       })
     },
     save() {

ui/src/views/data/mine/Edit.vue

@@ -16,21 +16,20 @@
           <a-input v-model="model.title" />
         </a-form-model-item>
 
-        <a-form-model-item label="目录" class="zui-input-group">
-          <a-form-model-item prop="folder" :style="{ display: 'inline-block', width: 'calc(50% - 30px)' }">
-            <a-select
-                v-model="model.folder"
-                placeholder="请选择">
+        <a-form-model-item label="目录" class="zui-input-group zui-input-with-tips">
+          <a-form-model-item prop="folder" :style="{ display: 'inline-block', width: 'calc(70% - 30px)' }">
+            <a-select v-model="model.folder" placeholder="请选择">
               <a-select-option v-for="(item, index) in dirs" :value="item.name" :key="index">
                 {{item.name}}</a-select-option>
             </a-select>
+            <span class="zui-input-tips">工作目录：{{workDir}}</span>
           </a-form-model-item>
 
           <span class="zui-input-group-addon" :style="{ width: '60px' }">
             <span>子目录</span>
           </span>
 
-          <a-form-model-item :style="{ display: 'inline-block', width: 'calc(50% - 30px)' }">
+          <a-form-model-item :style="{ display: 'inline-block', width: 'calc(30% - 30px)' }">
             <a-input v-model="model.subFolder"></a-input>
           </a-form-model-item>
         </a-form-model-item>
@@ -89,6 +88,7 @@ export default {
       id: 0,
       model: { folder: 'users/', type: 'text' },
       dirs: [],
+      workDir: '',
     };
   },
   computed: {
@@ -103,6 +103,7 @@ export default {
       console.log('getDef', json)
       this.model = json.data
       this.dirs = json.res
+      this.workDir = json.workDir
     })
   },
   mounted () {