页面更新

boman-web-core/src/main/java/com/boman/web/core/service/TableServiceCmdService.java

@@ -474,8 +474,7 @@ public class TableServiceCmdService {
                 String dictType = column.getDictType();
                 if (ObjectUtils.isNotEmpty(dictType)) {
                     try {
-                        List<SysDictData> sysDictData1 = remoteDictDataService.listByType(dictType);
-                        column.setSysDictData(sysDictData1);
+                        column.setSysDictData(listSysDictDataByType(dictType));
                     } catch (Exception e) {
                         System.out.println("sq_dictType = " + dictType);
                         e.printStackTrace();
@@ -515,8 +514,7 @@ public class TableServiceCmdService {
             if (GenTableColumn.IS_QUERY.equalsIgnoreCase(column.getIsQuery())) {
                 String dictType = column.getDictType();
                 if (ObjectUtils.isNotEmpty(dictType)) {
-                    List<SysDictData> sysDictData1 = remoteDictDataService.listByType(dictType);
-                    column.setSysDictData(sysDictData1);
+                    column.setSysDictData(listSysDictDataByType(dictType));
                 }
                 queryList.add(column);
             }
@@ -802,8 +800,7 @@ public class TableServiceCmdService {
         for (GenTableColumn column : columns) {
             String dictType = column.getDictType();
             if (predicate.test(dictType)) {
-                List<SysDictData> sysDictData1 = remoteDictDataService.listByType(dictType);
-                column.setSysDictData(sysDictData1);
+                column.setSysDictData(listSysDictDataByType(dictType));
             }
         }
     }
@@ -812,5 +809,15 @@ public class TableServiceCmdService {
     public AjaxResult listAllColumnsByTableId(GenTable table) {
         return remoteGenTableColumnService.listColumnsByTableId(table.getTableId());
     }
+
+    public List<SysDictData> listSysDictDataByType(String dictType){
+        List<SysDictData> sysDictData = null;
+        try {
+            sysDictData = remoteDictDataService.listByType(dictType);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return sysDictData;
+    }
 }
 

boman-web-core/src/main/java/com/boman/web/core/utils/ColumnUtils.java

@@ -151,7 +151,7 @@ public class ColumnUtils {
         List<String> all = map(origin, GenTableColumn::getColumnName);
         for (Map.Entry<String, Object> entry : target.entrySet()) {
             String columnName = entry.getKey();
-            if (!all.contains(columnName.toLowerCase()) || !all.contains(columnName.toUpperCase())) {
+            if (!all.contains(columnName.toLowerCase())) {
                 throw new IllegalArgumentException("此表 [" + tableName + "]中没有 [" + columnName + "] 字段");
             }
         }

ruoyi-ui/src/api/system/form.js

@@ -24,11 +24,45 @@ export function getObject(data) {
      data
    })
  }
- 
+
  export function listIndex(data) {
    return request({
      url: '/boman-web-core/p/cs/queryList',
      method: 'post',
      data: data
    })
- }
+ }
+
+ // 删除菜单
+ export function delMenutabform(data) {
+   return request({
+     url: 'boman-web-core/p/cs/objectDelete',
+     method: 'POST',
+     data
+   })
+ }
+
+ // 提交
+ export function tableSubimt(data) {
+   return request({
+     url: '/boman-web-core/p/cs/objectSubmit',
+     method: 'POST',
+     data
+   })
+ }
+  // 反提交
+  export function tableSubimtanit(data) {
+    return request({
+      url: '/boman-web-core/p/cs/objectUnSubmit',
+      method: 'POST',
+      data
+    })
+  }
+  // 保存
+  export function addbjectSave(data) {
+    return request({
+      url: '/boman-web-core/p/cs/objectSave',
+      method: 'POST',
+      data
+    })
+  }

ruoyi-ui/src/api/system/table.js

@@ -83,9 +83,10 @@ export function tableSubimt(data) {
  }
 
  // 删除菜单
- export function delMenutab(id) {
+ export function delMenutab(data) {
    return request({
-     url: 'boman-web-core/p/cs/objectDelete/' + id,
-     method: 'delete'
+     url: 'boman-web-core/p/cs/objectDelete',
+     method: 'POST',
+     data
    })
  }

ruoyi-ui/src/components/DynamicForm/index.vue

@@ -1,7 +1,7 @@
 <template>
     <el-form-item :label="formConfig.columnComment" style="display: inline-block;" :prop="formConfig.columnName">
       <!-- 输入框 -->
-      <el-input v-if="formConfig.htmlType == 'input'" v-model="config[formConfig.columnValue]" :placeholder="'请输入'+formConfig.columnComment"
+      <el-input v-if="formConfig.htmlType == 'input'" v-model="config[formConfig.columnName]" :placeholder="'请输入'+formConfig.columnComment"
         clearable @keyup.enter.native="handleQuery" />
       <!-- 多行输入框 -->
       <el-input v-if="formConfig.htmlType == 'textarea'" type="textarea" v-model="config[formConfig.columnName]" :placeholder="'请输入'+formConfig.columnComment"
@@ -86,15 +86,15 @@
     },
     methods: {
       upImageFn(res, file){
-        this.config.push(res.data);
+        this.config.push(res.data);
+        console.log(this.config,12153)
       },
       init() {
         if(this.formConfig.htmlType == 'checkbox' || this.formConfig.htmlType == 'imageUpload' || this.formConfig.htmlType == 'fileUpload'){
-          this.config =  []
+          this.config =  this.formConfig.columnValue || []
         }else{
-          this.config[this.formConfig.columnName] = this.formConfig.columnValue || ''
-        }
-        console.log(this.formConfig,this.config,9911112)
+          this.$set(this.config, this.formConfig.columnName,(this.formConfig.columnValue || ''))
+        }
       },
       handleChange(file, fileList) {
         this.fileList = fileList.slice(-3);

ruoyi-ui/src/components/DynamicForms/index.vue

@@ -1,7 +1,7 @@
 <template>
     <el-form-item :label="formConfig.columnComment" style="display: inline-block;" :prop="formConfig.columnName">
       <!-- 输入框 -->
-      <el-input v-if="formConfig.htmlType == 'input'" v-model="config[formConfig.columnValue]" :placeholder="'请输入'+formConfig.columnComment"
+      <el-input v-if="formConfig.htmlType == 'input'" v-model="config[formConfig.columnName]" :placeholder="'请输入'+formConfig.columnComment"
         clearable @keyup.enter.native="handleQuery" />
       <!-- 多行输入框 -->
       <el-input v-if="formConfig.htmlType == 'textarea'" type="textarea" v-model="config[formConfig.columnName]" :placeholder="'请输入'+formConfig.columnComment"
@@ -87,14 +87,14 @@
     methods: {
       upImageFn(res, file){
         this.config.push(res.data);
+        console.log(this.config,12153)
       },
       init() {
         if(this.formConfig.htmlType == 'checkbox' || this.formConfig.htmlType == 'imageUpload' || this.formConfig.htmlType == 'fileUpload'){
-          this.config =  []
+          this.config =  this.formConfig.columnValue || []
         }else{
-          this.config[this.formConfig.columnName] = this.formConfig.columnValue || ''
+          this.$set(this.config, this.formConfig.columnName,(this.formConfig.columnValue || ''))
         }
-        console.log(this.formConfig,this.config,9911112)
       },
       handleChange(file, fileList) {
         this.fileList = fileList.slice(-3);

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

@@ -27,55 +27,7 @@
            </el-row>
          </el-form>
        </el-collapse-item>
-       <!-- 扩展功能 -->
-       <!-- <el-collapse-item :title="title" :name="index" v-for="(item,index) in 1" :key="index" class="eitde">
-         <el-form :model="queryParams" ref="queryForm" :inline="true"  >
-           <el-row :gutter="0">
-             <el-col :span="12" v-for="(item,index) in 2" :key="index">
-               <el-form-item :label="labletit" prop="dictName" class="textarea_et">
-                <el-input
-               v-model="queryParams.dictName"
-               placeholder="请输入字典名称"
-               clearable
-               type="textarea"
-               style="width: 100%; height: 100%;"
-               @keyup.enter.native="handleQuery"
-               />
-              </el-form-item>
-           </el-col>
-           <el-col :span="24" v-for="(item,index) in 1" :key="index">
-               <el-form-item :label="labletit" prop="dictName" class="textarea_ety">
-                <el-input
-               v-model="queryParams.dictName"
-               placeholder="请输入字典名称"
-               clearable
-               type="textarea"
-               style="width: 100%; height: 100%;"
-               @keyup.enter.native="handleQuery"
-               />
-              </el-form-item>
-           </el-col>
-           </el-row>
-         </el-form>
-       </el-collapse-item> -->
-       <!-- 服务程序 -->
-       <!-- <el-collapse-item :title="title" :name="index" v-for="(item,index) in 1" :key="index" class="eitde">
-         <el-form :model="queryParams" ref="queryForm" :inline="true"  >
-           <el-row :gutter="0">
-            <el-col :span="12" v-for="(item,index) in 8" :key="index">
-                <el-form-item label="取消提交程序：" prop="dictName" class="textarea_etyju">
-                 <el-input
-                v-model="queryParams.dictName"
-                placeholder="请输入字典名称"
-                clearable
-                style="width: 100%;"
-                @keyup.enter.native="handleQuery"
-                />
-               </el-form-item>
-            </el-col>
-           </el-row>
-         </el-form>
-       </el-collapse-item> -->
+
 
      </el-collapse>
     </div>
@@ -128,12 +80,18 @@
             formy:{
               id:0,
               status:1
+            },
+            // 删除参数
+            deledlid:{
+              table:'',
+              idList:[]
             }
         };
       },
       mounted() {
         // this.edingelsie()
         // button
+        this.deledlid.idList = []
         this.formeanti.table = this.$route.query.tables
         // this.formeanti.id = this.$route.query.id
         this.forme.table = this.$route.query.tables
@@ -143,8 +101,10 @@
         this.tableZbie.fixedData.id = this.$route.query.id
         this.formy.id = this.$route.query.id
         this.tableZbietabg.table = this.$route.query.tables
-        console.log(this.forme.objId)
-        this.init()
+        this.deledlid.table = this.$route.query.tables
+        this.deledlid.idList.push(this.$route.query.id)
+        console.log(this.deledlid)
+
         // tab
         this.edingelsietab()
       },
@@ -181,7 +141,7 @@
          this.forme.table = this.tabldie[index].tableName
 
          this.tableZbie.table = this.tabldie[index].tableName
-         this.edingelsie()
+         // this.edingelsie()
          this.init()
         },
         // 按钮
@@ -210,6 +170,14 @@
          console.log(4566)
          geteditindeTab(this.tableZbietabg).then(response => {
            this.tabldie = response.data.ref
+           if(this.tabldie.length !==0){
+             this.init()
+           }else {
+             this.msgSuccess("暂无数据");
+
+             this.$router.go(-1)
+           }
+
            // this.msgSuccess("反提交成功");
            // this.open = false;
            // this.getList();
@@ -222,12 +190,14 @@
        },
        handleQuery(index) {
           console.log(index,4)
-          for(let item of this.taleLisst){
+          for(let item of this.queryData.showData){
             for(var i = 0 ; i < item.hrChildren.length ; i++){
               if(item.hrChildren[i].htmlType == 'checkbox' || item.hrChildren[i].htmlType == 'imageUpload' || item.hrChildren[i].htmlType == 'fileUpload'){
                 this.queryParams[item.hrChildren[i].columnName] = this.$refs[item.hrChildren[i].columnName][0].config
+                console.log(this.$refs[item.hrChildren[i].columnName][0].config)
               } else{
                 this.queryParams[item.hrChildren[i].columnName] = this.$refs[item.hrChildren[i].columnName][0].config[item.hrChildren[i].columnName]
+                console.log(this.$refs[item.hrChildren[i].columnName][0].config[item.hrChildren[i].columnName])
               }
             }
           }
@@ -240,7 +210,7 @@
           }
           if(index == 'D'){
             //删除
-            this.handleDelete(this.formy.id)
+            this.handleDelete(this.deledlid)
           }else if(index == 'S'){
             //提交  保存
              // this.formeanti.table = 'obj_test'
@@ -281,6 +251,7 @@
               addbjectSave(this.forme).then(response => {
                 this.msgSuccess("保存成功");
                 this.open = false;
+                this.$router.go(-1)
                 // this.getList();
               });
       },
@@ -290,6 +261,7 @@
           // 提交
           tableSubimt(this.formeanti).then(response => {
             this.msgSuccess("提交成功");
+            this.$router.go(-1)
             // this.open = false;
             // this.getList();
           });
@@ -297,6 +269,7 @@
           // 反提交
           tableSubimtanit(this.formeanti).then(response => {
             this.msgSuccess("反提交成功");
+            this.$router.go(-1)
             // this.open = false;
             // this.getList();
           });
@@ -304,7 +277,7 @@
       },
       //删除
       handleDelete(index) {
-        this.$confirm('是否确认删除名称为"' + index + '"的数据项?', "警告", {
+        this.$confirm('是否确认删除名称为"' + index.table + '"的数据项?', "警告", {
             confirmButtonText: "确定",
             cancelButtonText: "取消",
             type: "warning"
@@ -313,6 +286,7 @@
           }).then(() => {
             // this.getList();
             this.msgSuccess("删除成功");
+            this.$router.go(-1)
           })
       }
       },

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

@@ -55,7 +55,9 @@
     getTableQuery,
     getObject,
     geteditindeTab,
-    listIndex
+    listIndex,
+    delMenutabform,
+    tableSubimt, tableSubimtanit, addbjectSave
   } from '@/api/system/form.js'
 
   export default {
@@ -68,7 +70,7 @@
         loading:true,
         tabList: {},
         currentPage3: 0,
-        activeNames: ['1'],
+        activeNames: [1],
         title: '列表',
         objParams: {
           table: 'obj_test',
@@ -88,7 +90,7 @@
           pageNo: 1,
           pageSize: 10,
           orderBy:'create_time desc',
-          table: 'obj_test ',
+          table: '',
         },
         labletit: '查询参数1233',
         surlable: '实际数据库表',
@@ -110,6 +112,11 @@
         formy:{
           id:0,
           status:1
+        },
+        // 删除参数
+        deledlid:{
+          table:'',
+          idList:[]
         }
       };
     },
@@ -143,6 +150,9 @@
       this.tableZbietabg.table = this.$route.query.tables
       this.objParams.table = this.$route.query.tables
       this.objParams.fixedData.id = this.$route.query.id
+      this.deledlid.table = this.$route.query.tables
+      this.deledlid.idList.push(this.$route.query.id)
+      this.queryParamslist.table = this.$route.query.tables
       this.init()
       this.edingelsietab()
     },
@@ -249,7 +259,7 @@
          console.log(this.queryParams)
          if(index == 'D'){
            //删除
-           this.handleDelete(index)
+           this.handleDelete(this.deledlid)
          }else if(index == 'S'){
            //提交  保存
             // this.formeanti.table = 'obj_test'
@@ -258,7 +268,7 @@
             // this.formy.id = 0
             this.formeanti.commitData.push(this.formy)
             console.log(this.formeanti)
-           // this.antiSubmission()
+           this.antiSubmission()
          }else if(index == 'U'){
            //反提交  保存
             // this.formeanti.table = 'obj_test'
@@ -267,19 +277,19 @@
             // this.formy.id = 0
             this.formeanti.commitData.push(this.formy)
             console.log(this.formeanti)
-           // this.antiSubmission()
+           this.antiSubmission()
          }else if(index == 'M'){
            // 修改
            // this.forme.table = 'obj_test'
            // this.forme.objId = 1
            this.forme.fixedData = this.queryParams
-           // this.submitForm()
+           this.submitForm()
          }else if(index == 'A'){
            //新增
            // this.forme.table = 'obj_test'
            // this.forme.objId = -1
            this.forme.fixedData = this.queryParams
-           // this.submitForm()
+           this.submitForm()
          }
 
         console.log(this.forme)
@@ -311,6 +321,19 @@
          });
        }
      },
+     //删除
+     handleDelete(index) {
+       this.$confirm('是否确认删除名称为"' + index.table + '"的数据项?', "警告", {
+           confirmButtonText: "确定",
+           cancelButtonText: "取消",
+           type: "warning"
+         }).then(function() {
+           return delMenutab(index);
+         }).then(() => {
+           // this.getList();
+           this.msgSuccess("删除成功");
+         })
+     }
 
     },
   };

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

@@ -118,19 +118,14 @@
         path
       } = route;
       let items = this.sidebarRouters.filter(res => {
-        return res.path == ('/'+this.tabIndex.split('/')[1])
+        return res.path == ('/'+ path.split('/')[1])
       })[0].children.filter(res => {
-        return res.path == this.tabIndex.split('/')[2]
+        return res.path == path.split('/')[2]
       })[0]
       this.tabName = items.sysTableName
       this.queryParams.table = items.sysTableName
       this.form.table = items.sysTableName
-
-      console.log(items,99112)
-      // if (meta.activeMenu) {
-      //   this.$store.dispatch('TabFn', meta.activeMenu)
-      // }
-      // this.$store.dispatch('TabFn', path)
+      console.log(this.sidebarRouters,items,path,998812111)
       this.init();
       this.getList();
     },

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

@@ -71,6 +71,11 @@
         formy:{
           id:0,
           status:1
+        },
+        // 删除参数
+        deledlid:{
+          table:'',
+          idList:[]
         }
       };
     },
@@ -98,7 +103,7 @@
     },
     mounted() {
       // this.tableZbie.fixedData.id = 0
-
+       this.deledlid.idList = []
        this.formeanti.table = this.$route.query.tables
        // this.formeanti.id = this.$route.query.id
        this.forme.table = this.$route.query.tables
@@ -106,6 +111,8 @@
        this.tableZbie.table = this.$route.query.tables
        this.tableZbie.fixedData.id = this.$route.query.id
        this.formy.id = this.$route.query.id
+       this.deledlid.table = this.$route.query.tables
+       this.deledlid.idList.push(this.$route.query.tables)
        console.log(this.$route.query.id)
        console.log(this.tableZbie.table)
 
@@ -136,14 +143,14 @@
          console.log(this.queryParams)
          if(this.queryParams.pageNum !== undefined){
            this.queryParams.pageNum = undefined
-         } 
+         }
          if(this.queryParams.pageSize !== undefined){
            this.queryParams.pageSize = undefined
          }
          if(index == 'D'){
            //删除
            console.log(this.formy.id)
-           this.handleDelete(this.formy.id)
+           this.handleDelete(this.deledlid)
          }else if(index == 'S'){
            //提交  保存
             this.formeanti.commitData = []