Merge remote-tracking branch 'origin/master'

ruoyi-ui/src/layout/components/Sidebar/Item.vue

@@ -22,7 +22,7 @@ export default {
 
     if (title) {
       vnodes.push(<span slot='title' style="color: #343434">{(title)}</span>)
-    }
+    }  
     return vnodes
   }
 }

ruoyi-ui/src/main.js

@@ -31,6 +31,7 @@ import Pagination from "@/components/Pagination";
 import RightToolbar from "@/components/RightToolbar"
 import DynamicForm from "@/components/DynamicForm"
 import DynamicForms from "@/components/DynamicForms"
+import DynamicFormsteo from "@/components/DynamicFormsteo"
 import MemoranDum from "@/components/MemoranDum"
 import 'burgeon-ui/dist/styles/burgeon-ui.css';
 import 'burgeon-ui/dist/styles/bjIconfonts/iconfont.css';
@@ -69,6 +70,7 @@ Vue.component('Pagination', Pagination)
 Vue.component('RightToolbar', RightToolbar)
 Vue.component('DynamicForm', DynamicForm)
 Vue.component('DynamicForms', DynamicForms)
+Vue.component('DynamicFormsteo', DynamicFormsteo)
 Vue.component('MemoranDum', MemoranDum)
 
 Vue.use(permission)

ruoyi-ui/src/views/system/editing/index.vue

@@ -30,14 +30,14 @@
       </div>
     </div>
     <!-- 内容 -->
-    <div class="eniting_nav">
+    <div class="eniting_nav table_forem">
       <el-collapse v-model="activeNames" @change="handleChange" >
        <el-form v-show="num == 0" :rules="queryData.rules" :model="queryParams" ref="queryForm" :inline="true" label-width="120px">
           <el-collapse-item :title="item.columnComment" :name="index" v-for="(item,index) in queryData.showData" :key="index"
             class="eitde">
             <el-row>
               <el-col :span="24" :key="index">
-                <dynamic-forms @modelFn="modelFn" :ref="items.columnName" :config="queryParams" @inputs="changeFn" :formConfig="items"
+                <dynamic-formsteo @modelFn="modelFn" :ref="items.columnName" :config="queryParams" @inputs="changeFn" :formConfig="items"
                   v-for="(items,indexs) in item.hrChildren" :key='indexs' />
               </el-col>
             </el-row>
@@ -265,11 +265,18 @@
                  this.imgShoew = route.cssClass
                  if(route.cssClass == 2 || route.cssClass == 4 ){
                    route.hrChildren.filter(routers =>{
-
+                    if(this.queryData.table_column == undefined){
+                      this.queryData.table_column = null
+                    }
+                    routers.tableColumnuy = this.queryData.table_column
                      routers.isonliy = true
                    })
                  }else{
                    route.hrChildren.filter(routers =>{
+                     if(this.queryData.table_column == undefined){
+                       this.queryData.table_column = null
+                     }
+                     routers.tableColumnuy = this.queryData.table_column
                      routers.isonliy = false
                    })
                  }
@@ -561,6 +568,20 @@
 </script>
 
 <style lang="scss">
+  .table_forem{
+    .el-form--inline .el-form-item{
+      width: 100% !important;
+    }
+    .el-select{
+      width: 100%;
+    }
+    .el-date-editor.el-input{
+      width: 100% !important;
+    }
+    .el-form-item--medium .el-form-item__content{
+      width: 70%;
+    }
+  }
   .eniting_header {
     position: relative;
     .el-divider--horizontal {
@@ -645,7 +666,8 @@
       background-color: #fff;
       border-radius: 6px;
       padding: 23px;
-      margin-bottom: 20px;
+      padding-top: 0;
+      margin-bottom: 10px;
     }
   }
 </style>
@@ -668,8 +690,8 @@
     .eniting_header {
       background-color: #fff;
       border-radius: 6px;
-      padding: 23px;
-      margin-bottom: 20px;
+      padding: 13px;
+      margin-bottom: 10px;
 
       .p {
         font-size: 15px;

ruoyi-ui/src/views/system/form/index.vue

@@ -13,14 +13,12 @@
       </div>
     </div>
     <!-- 内容 -->
-    <div class="table_nav">
+    <div class="table_nav table_forem" >
       <el-collapse v-model="activeNames">
-         <el-form :model="queryParams" :rules="queryData.rules" ref="queryForm" :inline="true" label-width="120px">
+         <el-form :model="queryParams" :rules="queryData.rules" ref="queryForm" :inline="true" :label-width="this.queryData.table_column == 6 ? 80 :120">
         <el-collapse-item :title="item.columnComment" :name="index" v-for="(item,index) in queryData.showData" :key="index" class="eitde">
             <el-row :gutter="0">
-              <el-col :span="24"  :key="index">
-                  <dynamic-forms @modelFn="modelFn" :ref="items.columnName" :config="queryParams" @inputs = "changeFn" :formConfig="items" v-for="(items,indexs) in item.hrChildren" :key='indexs' />
-              </el-col>
+                  <dynamic-formsteo @modelFn="modelFn" :ref="items.columnName" :config="queryParams" @inputs = "changeFn" :formConfig="items" v-for="(items,indexs) in item.hrChildren" :key='indexs' />
             </el-row>
         </el-collapse-item>
         </el-form>
@@ -36,7 +34,7 @@
           <el-divider></el-divider>
           <div style="display: flex; align-items: center; margin-bottom: 20px;" class="hiueo">
             <el-form style="display: flex; align-items:center;" :model="queryParamstwoi" ref="queryForm" :inline="true" >
-              <dynamic-forms :ref="item.columnName" :config="queryParamstwoi" @inputs="changeFn" :formConfig="item" v-for="(item,index) in queryDatatao.queryList"
+              <DynamicForms :ref="item.columnName" :config="queryParamstwoi" @inputs="changeFn" :formConfig="item" v-for="(item,index) in queryDatatao.queryList"
                 :key='index' />
               <el-form-item>
                 <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQueryiu">搜索</el-button>
@@ -258,10 +256,18 @@
                  if(route.cssClass == 2 || route.cssClass == 4){
                    route.hrChildren.filter(routers =>{
                      routers.isonliy = true
+                     if(this.queryData.table_column == undefined){
+                       this.queryData.table_column = null
+                     }
+                     routers.tableColumnuy = this.queryData.table_column
                    })
                  }else{
                    route.hrChildren.filter(routers =>{
                      routers.isonliy = false
+                     if(this.queryData.table_column == undefined){
+                       this.queryData.table_column = null
+                     }
+                     routers.tableColumnuy = this.queryData.table_column
                    })
                  }
                }
@@ -543,24 +549,25 @@
          //删除
          this.handleDeletetwo(this.deledlid)
        }  else if(index == '新增'){
-           this.routerFn(-1, this.tabName,this.oieufr)
+           this.routerFn(-1, this.tabName,this.oieufr,this.forme.table)
        }else if(index == '修改'){
          if (this.single) {
            this.msgInfo('请勾选一条信息')
            return
          }
          const id = this.ids.join(',')
-         this.routerFn(id, this.tabName,this.oieufr)
+         this.routerFn(id, this.tabName,this.oieufr,this.forme.table)
        }
      },
-     routerFn(id, tables,tabfe) {
+     routerFn(id, tables,tabfe, tabik) {
        if (this.queryDatatao.viewType == 'crud') {
          this.$router.push({
            path: 'table',
            query: {
              id,
              tables,
-             tabfe
+             tabfe,
+             tabik
            },
          })
        } else if (this.queryDatatao.viewType == 'headTab') {
@@ -569,7 +576,8 @@
            query: {
              id,
              tables,
-             tabfe
+             tabfe,
+             tabik
            },
          })
        }
@@ -621,10 +629,25 @@
       .eitde {
         background-color: #fff;
         border-radius: 6px;
-        padding: 23px;
-        margin-bottom: 20px;
+        padding: 23px;
+        padding-top: 0;
+        margin-bottom: 10px;
       }
     }
+  }
+  .table_forem{
+    .el-form--inline .el-form-item{
+      width: 100% !important;
+    }
+    .el-select{
+      width: 100%;
+    }
+    .el-date-editor.el-input{
+      width: 100% !important;
+    }
+    .el-form-item--medium .el-form-item__content{
+      width: 70%;
+    }
   }
 </style>
 
@@ -642,8 +665,8 @@
     .tabForm_header {
       background-color: #fff;
       border-radius: 6px;
-      padding: 23px;
-      margin-bottom: 20px;
+      padding: 13px;
+      margin-bottom: 10px;
       position: relative;
     }
 

ruoyi-ui/src/views/system/table/index.vue

@@ -13,15 +13,15 @@
       </div>
     </div>
     <!-- 内容 -->
-    <div class="table_nav headertable_nav" >
+    <div class="table_nav headertable_nav table_forem" >
       <el-collapse v-model="activeNames" @change="handleChange">
-        <el-form :model="queryParams" :rules="queryData.rules" ref="queryForm" :inline="true" label-width="120px">
+        <el-form :model="queryParams" :rules="queryData.rules" ref="queryForm" :inline="true" :label-width=" this.queryData.table_column == 6 ? 80 :120" >
           <el-collapse-item :title="item.columnComment" :name="index" v-for="(item,index) in queryData.showData" :key="index">
-            <el-row>
-              <el-col :span="24" :key="index">
-                <dynamic-forms @modelFn="modelFn" :ref="items.columnName" :config="queryParams" @inputs="changeFn" :formConfig="items" v-for="(items,indexs) in item.hrChildren"
+            <el-row    class="row-bg" >
+              <!-- <el-col :span="24" :key="index" > -->
+                <DynamicFormsteo @modelFn="modelFn" :ref="items.columnName" :config="queryParams" @inputs="changeFn" :formConfig="items" v-for="(items,indexs) in item.hrChildren"
                   :key='indexs' />
-              </el-col>
+              <!-- </el-col> -->
             </el-row>
           </el-collapse-item>
         </el-form>
@@ -180,8 +180,7 @@
           //新增
           this.xidugje = 0
           this.reload()
-        } else if (index == '返回') {
-          this.$store.dispatch("tagsView/delView", this.$route);
+        } else if (index == '返回') {
             this.$router.go(-1)
         } else if (index == '刷新') {
           this.xidugje = 1
@@ -258,15 +257,24 @@
          // 图片的显示隐藏
          if(this.queryData.showData.length !==0){
           this.queryData.showData.filter(route => {
+
             if(route.cssClass !== null){
               this.imgShoew = route.cssClass
               if(route.cssClass == 2 || route.cssClass == 4){
                 route.hrChildren.filter(routers =>{
                   routers.isonliy = true
+                  if(this.queryData.table_column == undefined){
+                    this.queryData.table_column = null
+                  }
+                  routers.tableColumnuy = this.queryData.table_column
                 })
               }else{
                 route.hrChildren.filter(routers =>{
                   routers.isonliy = false
+                  if(this.queryData.table_column == undefined){
+                    this.queryData.table_column = null
+                  }
+                  routers.tableColumnuy = this.queryData.table_column
                 })
               }
             }
@@ -299,8 +307,7 @@
             // }
             addbjectSave(this.forme).then(response => {
               this.msgSuccess("保存成功");
-              // this.open = false;
-              this.$store.dispatch("tagsView/delView", this.$route);
+              // this.open = false;
               this.$router.go(-1)
             });
           }
@@ -313,16 +320,14 @@
             if (this.formy.status == 1) {
               // 提交
               tableSubimt(this.formeanti).then(response => {
-                this.msgSuccess("提交成功");
-                this.$store.dispatch("tagsView/delView", this.$route);
+                this.msgSuccess("提交成功");
                 this.$router.go(-1)
                 // this.getList();
               });
             } else if (this.formy.status == 2) {
               // 反提交
               tableSubimtanit(this.formeanti).then(response => {
-                this.msgSuccess("反提交成功");
-                this.$store.dispatch("tagsView/delView", this.$route);
+                this.msgSuccess("反提交成功");
                 this.$router.go(-1)
                 // this.getList();
               });
@@ -340,8 +345,7 @@
           return delMenutab(index);
         }).then(() => {
           // this.getList();
-          this.msgSuccess("删除成功");
-          this.$store.dispatch("tagsView/delView", this.$route);
+          this.msgSuccess("删除成功");
           this.$router.go(-1)
         })
       }
@@ -356,6 +360,20 @@
       margin-top: 16px;
     }
   }
+  .table_forem{
+    .el-form--inline .el-form-item{
+      width: 100% !important;
+    }
+    .el-select{
+      width: 100%;
+    }
+    .el-date-editor.el-input{
+      width: 100% !important;
+    }
+    .el-form-item--medium .el-form-item__content{
+      width: 70%;
+    }
+  }
   .headertable_nav{
     .el-collapse-item__wrap{
       border-bottom: 0;
@@ -392,8 +410,8 @@
      .table_header{
         background-color: #fff;
         border-radius: 6px;
-        padding: 23px;
-        margin-bottom: 20px;
+        padding: 13px;
+        margin-bottom: 10px;
       p{
          font-size: 15px;
          font-weight: bold;
@@ -447,8 +465,8 @@
     .table_header {
       background-color: #fff;
       border-radius: 6px;
-      padding: 23px;
-      margin-bottom: 20px;
+      padding: 13px;
+      margin-bottom: 10px;
 
       p {
         font-size: 15px;
@@ -472,7 +490,8 @@
     .headertable_nav {
       background-color: #fff;
       border-radius: 6px;
-      padding: 23px;
+      padding: 23px;
+      padding-top: 0;
     }
   }
 

ruoyi-ui/src/views/tool/gen/basicInfoForm.vue

@@ -23,6 +23,11 @@
             <el-radio label="N">否</el-radio>
           </el-radio-group>
         </el-form-item>
+      </el-col>
+      <el-col :span="12">
+        <el-form-item  label="列数" prop="tableColumn">
+          <el-input type="number" :max="4" v-model="info.tableColumn" placeholder="请输入列数" />
+        </el-form-item>
       </el-col>
       <el-col :span="12">
         <el-form-item  label="菜单权限" prop="menuRole">
@@ -130,7 +135,10 @@ export default {
         ],
         viewType: [
           { required: true, message: "页面模板不能为空", trigger: "blur" }
-        ],
+        ],
+        tableColumn: [
+          { required: true, message: "列数不能为空", trigger: "blur" }
+        ]
       }
     };
   }

ruoyi-ui/src/views/tool/gen/index.vue

@@ -124,6 +124,11 @@
               </el-radio-group>
             </el-form-item>
           </el-col>
+          <el-col :span="12">
+            <el-form-item label="列数" prop="tableColumn">
+              <el-input type="number" :max="4" v-model="form.tableColumn" placeholder="请输入列数" maxlength="50" />
+            </el-form-item>
+          </el-col>
           <el-col :span="12">
             <el-form-item label="菜单权限" prop="menuRole">
               <el-input v-model="form.menuRole" placeholder="请输入菜单权限" />
@@ -164,6 +169,7 @@
               <el-input v-model="form.extendedAttributes" type="textarea" placeholder="请输入内容"></el-input>
             </el-form-item>
           </el-col>
+
           <el-col :span="12">
             <el-form-item label="备注" prop="remark">
               <el-input v-model="form.remark" type="textarea" placeholder="请输入内容"></el-input>
@@ -262,6 +268,11 @@
             required: true,
             message: "菜单权限不能为空",
             trigger: "blur"
+          }],
+          tableColumn: [{
+            required: true,
+            message: "列数不能为空",
+            trigger: "blur"
           }]
         }
       };
@@ -396,6 +407,10 @@
       },
       /** 提交按钮 */
       submitForm: function() {
+        if( this.form.tableColumn > 4 ){
+          this.msgSuccess("列数不能大于4");
+          return false
+        }
         this.$refs["form"].validate(valid => {
           if (valid) {
             if (this.form.id != undefined) {