Merge remote-tracking branch 'origin/master'

boman-api/boman-domain/src/main/java/com.boman.domain/GenTable.java

@@ -1,12 +1,6 @@
 package com.boman.domain;
 
 import java.util.List;
-import javax.validation.Valid;
-import javax.validation.constraints.NotBlank;
-import org.apache.commons.lang3.ArrayUtils;
-import com.boman.common.core.constant.GenConstants;
-import com.boman.common.core.utils.StringUtils;
-import com.boman.common.core.web.domain.BaseEntity;
 
 /**
  * 业务表 gen_table
@@ -21,11 +15,11 @@ public class GenTable extends BaseEntity
     private Long tableId;
 
     /** 表名称 */
-    @NotBlank(message = "表名称不能为空")
+//    @NotBlank(message = "表名称不能为空")
     private String tableName;
 
     /** 表描述 */
-    @NotBlank(message = "表描述不能为空")
+//    @NotBlank(message = "表描述不能为空")
     private String tableComment;
 
     /** 关联父表的表名 */
@@ -74,11 +68,11 @@ public class GenTable extends BaseEntity
     private GenTable subTable;
 
     /** 表列信息 */
-    @Valid
+//    @Valid
     private List<GenTableColumn> columns;
 
     /** 主表关联的附表信息（附表包含字段信息） */
-    @Valid
+//    @Valid
     private List<GenTable> relationList;
 
     /** 其它生成选项 */
@@ -92,7 +86,7 @@ public class GenTable extends BaseEntity
     /**
      * 菜单权限(AMDQSUE)
      */
-    @NotBlank(message = "菜单权限不能为空")
+//    @NotBlank(message = "菜单权限不能为空")
     private String menuRole;
 
     /**
@@ -536,49 +530,48 @@ public class GenTable extends BaseEntity
         this.parentMenuName = parentMenuName;
     }
 
-    public boolean isSub()
-    {
-        return isSub(this.tplCategory);
-    }
-
-    public static boolean isSub(String tplCategory)
-    {
-        return tplCategory != null && StringUtils.equals(GenConstants.TPL_SUB, tplCategory);
-    }
-    public boolean isTree()
-    {
-        return isTree(this.tplCategory);
-    }
-
-    public static boolean isTree(String tplCategory)
-    {
-        return tplCategory != null && StringUtils.equals(GenConstants.TPL_TREE, tplCategory);
-    }
-
-    public boolean isCrud()
-    {
-        return isCrud(this.tplCategory);
-    }
-
-    public static boolean isCrud(String tplCategory)
-    {
-        return tplCategory != null && StringUtils.equals(GenConstants.TPL_CRUD, tplCategory);
-    }
-
-    public boolean isSuperColumn(String javaField)
-    {
-        return isSuperColumn(this.tplCategory, javaField);
-    }
-
-    public static boolean isSuperColumn(String tplCategory, String javaField)
-    {
-        if (isTree(tplCategory))
-        {
-            return StringUtils.equalsAnyIgnoreCase(javaField,
-                    ArrayUtils.addAll(GenConstants.TREE_ENTITY, GenConstants.BASE_ENTITY));
-        }
-        return StringUtils.equalsAnyIgnoreCase(javaField, GenConstants.BASE_ENTITY);
-    }
+//    public boolean isSub()
+//    {
+//        return isSub(this.tplCategory);
+//    }
+//
+//    public static boolean isSub(String tplCategory)
+//    {
+//        return tplCategory != null && StringUtils.equals(GenConstants.TPL_SUB, tplCategory);
+//    }
+//    public boolean isTree()
+//    {
+//        return isTree(this.tplCategory);
+//    }
+//
+//    public static boolean isTree(String tplCategory)
+//    {
+//        return tplCategory != null && StringUtils.equals(GenConstants.TPL_TREE, tplCategory);
+//    }
+//
+//    public boolean isCrud()
+//    {
+//        return isCrud(this.tplCategory);
+//    }
+
+//    public static boolean isCrud(String tplCategory)
+//    {
+//        return tplCategory != null && StringUtils.equals(GenConstants.TPL_CRUD, tplCategory);
+//    }
+
+//    public boolean isSuperColumn(String javaField)
+//    {
+//        return isSuperColumn(this.tplCategory, javaField);
+//    }
+
+//    public static boolean isSuperColumn(String tplCategory, String javaField)
+//    {
+//        if (isTree(tplCategory))
+//        {
+//            return StringUtils.equalsAnyIgnoreCase(javaField, ArrayUtils.addAll(GenConstants.TREE_ENTITY, GenConstants.BASE_ENTITY));
+//        }
+//        return StringUtils.equalsAnyIgnoreCase(javaField, GenConstants.BASE_ENTITY);
+//    }
 
     public List<GenTable> getRelationList() {
         return relationList;

boman-api/boman-domain/src/main/java/com.boman.domain/GenTableColumn.java

@@ -1,14 +1,11 @@
 package com.boman.domain;
 
-import com.boman.common.core.utils.StringUtils;
-import com.boman.common.core.web.domain.BaseEntity;
-
 import java.util.List;
 import java.util.Map;
 
 /**
  * 代码生成业务字段表 gen_table_column
- * 
+ *
  * @author ruoyi
  */
 public class GenTableColumn extends BaseEntity
@@ -300,10 +297,10 @@ public class GenTableColumn extends BaseEntity
         return javaField;
     }
 
-    public String getCapJavaField()
-    {
-        return StringUtils.capitalize(javaField);
-    }
+//    public String getCapJavaField()
+//    {
+//        return StringUtils.capitalize(javaField);
+//    }
 
     public void setIsPk(String isPk)
     {
@@ -315,15 +312,15 @@ public class GenTableColumn extends BaseEntity
         return isPk;
     }
 
-    public boolean isPk()
-    {
-        return isPk(this.isPk);
-    }
+//    public boolean isPk()
+//    {
+//        return isPk(this.isPk);
+//    }
 
-    public boolean isPk(String isPk)
-    {
-        return isPk != null && StringUtils.equals("1", isPk);
-    }
+//    public boolean isPk(String isPk)
+//    {
+//        return isPk != null && StringUtils.equals("1", isPk);
+//    }
 
     public String getIsIncrement()
     {
@@ -335,15 +332,15 @@ public class GenTableColumn extends BaseEntity
         this.isIncrement = isIncrement;
     }
 
-    public boolean isIncrement()
-    {
-        return isIncrement(this.isIncrement);
-    }
+//    public boolean isIncrement()
+//    {
+//        return isIncrement(this.isIncrement);
+//    }
 
-    public boolean isIncrement(String isIncrement)
-    {
-        return isIncrement != null && StringUtils.equals("1", isIncrement);
-    }
+//    public boolean isIncrement(String isIncrement)
+//    {
+//        return isIncrement != null && StringUtils.equals("1", isIncrement);
+//    }
 
     public void setIsRequired(String isRequired)
     {
@@ -355,15 +352,15 @@ public class GenTableColumn extends BaseEntity
         return isRequired;
     }
 
-    public boolean isRequired()
-    {
-        return isRequired(this.isRequired);
-    }
+//    public boolean isRequired()
+//    {
+//        return isRequired(this.isRequired);
+//    }
 
-    public boolean isRequired(String isRequired)
-    {
-        return isRequired != null && StringUtils.equals("1", isRequired);
-    }
+//    public boolean isRequired(String isRequired)
+//    {
+//        return isRequired != null && StringUtils.equals("1", isRequired);
+//    }
 
     public void setIsInsert(String isInsert)
     {
@@ -375,15 +372,15 @@ public class GenTableColumn extends BaseEntity
         return isInsert;
     }
 
-    public boolean isInsert()
-    {
-        return isInsert(this.isInsert);
-    }
+//    public boolean isInsert()
+//    {
+//        return isInsert(this.isInsert);
+//    }
 
-    public boolean isInsert(String isInsert)
-    {
-        return isInsert != null && StringUtils.equals("1", isInsert);
-    }
+//    public boolean isInsert(String isInsert)
+//    {
+//        return isInsert != null && StringUtils.equals("1", isInsert);
+//    }
 
     public void setIsEdit(String isEdit)
     {
@@ -395,15 +392,15 @@ public class GenTableColumn extends BaseEntity
         return isEdit;
     }
 
-    public boolean isEdit()
-    {
-        return isInsert(this.isEdit);
-    }
+//    public boolean isEdit()
+//    {
+//        return isInsert(this.isEdit);
+//    }
 
-    public boolean isEdit(String isEdit)
-    {
-        return isEdit != null && StringUtils.equals("1", isEdit);
-    }
+//    public boolean isEdit(String isEdit)
+//    {
+//        return isEdit != null && StringUtils.equals("1", isEdit);
+//    }
 
     public void setIsList(String isList)
     {
@@ -415,15 +412,15 @@ public class GenTableColumn extends BaseEntity
         return isList;
     }
 
-    public boolean isList()
-    {
-        return isList(this.isList);
-    }
+//    public boolean isList()
+//    {
+//        return isList(this.isList);
+//    }
 
-    public boolean isList(String isList)
-    {
-        return isList != null && StringUtils.equals("1", isList);
-    }
+//    public boolean isList(String isList)
+//    {
+//        return isList != null && StringUtils.equals("1", isList);
+//    }
 
     public void setIsQuery(String isQuery)
     {
@@ -435,15 +432,15 @@ public class GenTableColumn extends BaseEntity
         return isQuery;
     }
 
-    public boolean isQuery()
-    {
-        return isQuery(this.isQuery);
-    }
+//    public boolean isQuery()
+//    {
+//        return isQuery(this.isQuery);
+//    }
 
-    public boolean isQuery(String isQuery)
-    {
-        return isQuery != null && StringUtils.equals("1", isQuery);
-    }
+//    public boolean isQuery(String isQuery)
+//    {
+//        return isQuery != null && StringUtils.equals("1", isQuery);
+//    }
 
     public void setQueryType(String queryType)
     {
@@ -485,53 +482,53 @@ public class GenTableColumn extends BaseEntity
         return sort;
     }
 
-    public boolean isSuperColumn()
-    {
-        return isSuperColumn(this.javaField);
-    }
-
-    public static boolean isSuperColumn(String javaField)
-    {
-        return StringUtils.equalsAnyIgnoreCase(javaField,
-                // BaseEntity
-                "createBy", "createTime", "updateBy", "updateTime", "remark",
-                // TreeEntity
-                "parentName", "parentId", "orderNum", "ancestors");
-    }
-
-    public boolean isUsableColumn()
-    {
-        return isUsableColumn(javaField);
-    }
-
-    public static boolean isUsableColumn(String javaField)
-    {
-        // isSuperColumn()中的名单用于避免生成多余Domain属性，若某些属性在生成页面时需要用到不能忽略，则放在此处白名单
-        return StringUtils.equalsAnyIgnoreCase(javaField, "parentId", "orderNum", "remark");
-    }
-
-    public String readConverterExp()
-    {
-        String remarks = StringUtils.substringBetween(this.columnComment, "（", "）");
-        StringBuffer sb = new StringBuffer();
-        if (StringUtils.isNotEmpty(remarks))
-        {
-            for (String value : remarks.split(" "))
-            {
-                if (StringUtils.isNotEmpty(value))
-                {
-                    Object startStr = value.subSequence(0, 1);
-                    String endStr = value.substring(1);
-                    sb.append("").append(startStr).append("=").append(endStr).append(",");
-                }
-            }
-            return sb.deleteCharAt(sb.length() - 1).toString();
-        }
-        else
-        {
-            return this.columnComment;
-        }
-    }
+//    public boolean isSuperColumn()
+//    {
+//        return isSuperColumn(this.javaField);
+//    }
+
+//    public static boolean isSuperColumn(String javaField)
+//    {
+//        return StringUtils.equalsAnyIgnoreCase(javaField,
+//                // BaseEntity
+//                "createBy", "createTime", "updateBy", "updateTime", "remark",
+//                // TreeEntity
+//                "parentName", "parentId", "orderNum", "ancestors");
+//    }
+
+//    public boolean isUsableColumn()
+//    {
+//        return isUsableColumn(javaField);
+//    }
+
+//    public static boolean isUsableColumn(String javaField)
+//    {
+//        // isSuperColumn()中的名单用于避免生成多余Domain属性，若某些属性在生成页面时需要用到不能忽略，则放在此处白名单
+//        return StringUtils.equalsAnyIgnoreCase(javaField, "parentId", "orderNum", "remark");
+//    }
+
+//    public String readConverterExp()
+//    {
+//        String remarks = StringUtils.substringBetween(this.columnComment, "（", "）");
+//        StringBuffer sb = new StringBuffer();
+//        if (StringUtils.isNotEmpty(remarks))
+//        {
+//            for (String value : remarks.split(" "))
+//            {
+//                if (StringUtils.isNotEmpty(value))
+//                {
+//                    Object startStr = value.subSequence(0, 1);
+//                    String endStr = value.substring(1);
+//                    sb.append("").append(startStr).append("=").append(endStr).append(",");
+//                }
+//            }
+//            return sb.deleteCharAt(sb.length() - 1).toString();
+//        }
+//        else
+//        {
+//            return this.columnComment;
+//        }
+//    }
 
     public List<SysDictData> getSysDictData() {
         return sysDictData;

boman-api/boman-domain/src/main/java/com.boman.domain/GenTableRelation.java

@@ -1,6 +1,5 @@
 package com.boman.domain;
 
-import com.boman.common.core.web.domain.BaseEntity;
 
 /**
  * @author tjf

boman-api/boman-domain/src/main/java/com.boman.domain/TableSql.java

@@ -1,6 +1,5 @@
 package com.boman.domain;
 
-import com.boman.common.core.web.domain.BaseEntity;
 
 /**
  * @author tjf

boman-web-core/src/main/java/com/boman/web/core/service/update/BaseUpdateServiceImpl.java

@@ -72,7 +72,7 @@ public class BaseUpdateServiceImpl implements IBaseUpdateService {
 
     private String covert(String columnType, String value) {
         // false 不需要转义
-        boolean needEscape = columnType.contains(VARCHAR) || columnType.contains(CHAR)
+        boolean needEscape = columnType.contains(VARCHAR) || columnType.contains(CHAR) || columnType.contains(BLOB)
                 || columnType.contains(DATETIME) || columnType.contains(TIMESTAMP);
         return needEscape ? escapeStr(value) : value;
     }

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

@@ -45,13 +45,13 @@ public class ColumnUtils {
             }
 
             if (UPDATE_TIME.equalsIgnoreCase(columnName)) {
-                jsonObject.put(columnName, currentTime.toString());
+                jsonObject.put(columnName, currentTime);
                 continue;
             }
 
             if (isSave) {
                 if (CREATE_TIME.equalsIgnoreCase(columnName)) {
-                    jsonObject.put(columnName, currentTime.toString());
+                    jsonObject.put(columnName, currentTime);
                     continue;
                 }
                 if (CREATE_BY.equalsIgnoreCase(columnName)) {
@@ -59,15 +59,17 @@ public class ColumnUtils {
                     continue;
                 }
                 if (DATETIME.equalsIgnoreCase(column.getColumnType())) {
-                    Object value = jsonObject.get(columnName);
-                    if (isEmpty(((String) value))) {
-                        jsonObject.put(columnName, currentTime.toString());
+                    Object value = jsonObject.getTimestamp(columnName);
+                    if (isNotEmpty(value)) {
+                        jsonObject.put(columnName, jsonObject.getTimestamp(columnName));
                     }
                 }
             } else {
                 // 修改时，修改非创建时间的其他时间类型
-                if (!CREATE_TIME.equalsIgnoreCase(columnName) && DATETIME.equalsIgnoreCase(column.getColumnType())) {
-                    jsonObject.put(columnName, currentTime.toString());
+                if (DATETIME.equalsIgnoreCase(column.getColumnType())) {
+                    if (!CREATE_TIME.equalsIgnoreCase(columnName) && isNotEmpty(jsonObject.get(columnName))) {
+                        jsonObject.put(columnName, jsonObject.getTimestamp(columnName));
+                    }
                 }
             }
         }

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

@@ -0,0 +1,8 @@
+<template>
+</template>
+
+<script>
+</script>
+
+<style>
+</style>

ruoyi-ui/src/settings.js

@@ -1,7 +1,7 @@
 module.exports = {
   title: '潜山市云数据中心',
-  // urls: `http://192.168.101.11:8090`,
-  urls: `http://192.168.101.110:8090`,
+  urls: `http://192.168.101.11:8090`,
+  // urls: `http://192.168.101.110:8090`,
   // urls: `http://192.168.101.49:8080`,
 
   // urls: ``,

ruoyi-ui/src/views/index.vue

@@ -9,7 +9,7 @@
           </p>
                 <div style="height: 87%;">
                   <ul class="index_headerUl">
-                    <li v-for="(item,index) in configList" :key="index">
+                    <li v-for="(item,index) in configList" :key="index" @click="headerCld(item)">
                         <img src="../assets/images/icon_list_sj.png" alt="">
                         <p>{{item.notice_title}}</p>
                         <span>{{item.create_time}}</span>
@@ -227,28 +227,29 @@
     </el-row>
     <!-- <el-divider /> -->
   <!-- 添加或修改公告对话框 -->
-  <el-dialog :title="title" :visible.sync="open" width="980px" append-to-body>
-           <el-form ref="form" :model="form" :rules="rules" label-width="160px" class="from_index">
-             <el-row>
-               <el-col :span="24" >
-                <dynamic-forms   :ref="item.columnName" :config="form.fixedData" @inputs = "changeFn" :formConfig="item" v-for="(item,index) in queryData.showData" :key='index' />
-               </el-col>
-             </el-row>
-           </el-form>
-           <div slot="footer" class="dialog-footer">
-             <el-button type="primary" @click="handleQuery">确 定</el-button>
-             <el-button @click="cancel">取 消</el-button>
+  <el-dialog :close-on-click-modal="false" :title="title" :visible.sync="open" width="980px" append-to-body>
+            <el-form ref="form" :model="form" :rules="rules" label-width="160px" class="from_index">
+              <el-row>
+                <el-col :span="24" >
+                 <dynamic-forms   :ref="item.columnName" :config="form.fixedData" @inputs = "changeFn" :formConfig="item" v-for="(item,index) in queryData.showData" :key='index' />
+                </el-col>
+              </el-row>
+            </el-form>
+            <div slot="footer" class="dialog-footer">
+              <el-button type="primary" @click="handleQuery">确 定</el-button>
+              <el-button @click="cancel">取 消</el-button>
+            </div>
+  </el-dialog>
+  <!-- 通知公告弹窗 -->
+  <el-dialog :close-on-click-modal="false" :title="title" :visible.sync="openety" width="980px" append-to-body>
+           <div class="index_headertan" >
+               <p>{{actingk.notice_title == undefined? '暂无数据' : actingk.notice_title}}</p>
+               <p>{{actingk.create_time == undefined? '暂无数据' : actingk.create_time}} 发布人:{{actingk.create_by}}</p>
+               <p v-html="actingk.notice_content"></p>
            </div>
-            <!-- if(){ -->
-              <!-- 日历 -->
-
-              <!-- <dynamic-forms v-if="nummer == 0" :config="form" @inputs = "changeFn" :formConfig="queryData" :open="open" @submitForm="submitForm($event)" @cancel="cancel($event)" :nummer = "nummer" /> -->
-            <!-- }else if(){ -->
-              <!-- 备忘录 -->
-              <!-- <memoran-dum v-if="nummer == 1" :config="form" @inputs = "changeFn" :formConfig="queryDatatwo" :open="open"  @cancel="cancel($event)" :nummer = "nummer" /> -->
-            <!-- } -->
 
   </el-dialog>
+
   </div>
 </template>
 
@@ -427,7 +428,10 @@ export default {
           confirmPassword: undefined
         },
         shower:true, //判断删除图标是否显示
-      }
+      },
+      titlees:'通知公告',//通知公告弹框
+      openety:false,
+      actingk:{}
     };
   },
 
@@ -723,6 +727,7 @@ export default {
     // 取消按钮
     cancel() {
       this.open = false;
+      this.openety = false
       this.reset();
     },
     /** 新增按钮操作 */
@@ -798,7 +803,7 @@ export default {
       that.deledlid.idList = []
       that.deledlid.idList.push(id)
 
-     this.$confirm('是否确认删除名称为"' + id + '"的数据项?', "警告", {
+     this.$confirm('是否确认删除', "警告", {
          confirmButtonText: "确定",
          cancelButtonText: "取消",
          type: "warning"
@@ -836,6 +841,12 @@ export default {
         this.getLismemorandum()
        console.log(this.user,97653)
       });
+    },
+    // 通知公告弹窗
+    headerCld(index){
+      // this.title = '通知公告'
+      //  this.openety = true,
+      //  this.actingk=index
     }
   },
 };
@@ -923,6 +934,7 @@ export default {
     padding-top: 10px;
     padding-bottom: 10px;
    span{
+     cursor:pointer;
      width: 70px;
      text-align: center;
      line-height: 55px;
@@ -992,6 +1004,7 @@ export default {
         justify-content: space-between;
         align-items: center;
         height: 43px;
+        cursor:pointer;
         img{
           width: 11px;
           height: 13px;
@@ -1098,12 +1111,14 @@ export default {
          height: 8px;
          background: #3C8DBC;
          border-radius: 3px;
+
        }
        span:nth-child(2){
          font-size: 12px;
          font-family: PingFang SC;
          font-weight: 400;
          color: #3C8DBC;
+         cursor:pointer;
        }
     }
   }
@@ -1260,5 +1275,30 @@ export default {
     background-color: #F2F2F2;
   }
 }
+// 通知公告弹窗
+.index_headertan{
+  margin: 0 30px;
+  p{
+    margin: 0;
+  }
+  p:nth-child(1){
+    font-size: 24px;
+    font-family: PingFang SC;
+    font-weight: bold;
+    color: #343434;
+    line-height: 24px;
+    text-align: center;
+    margin-bottom: 10px;
+  }
+  p:nth-child(2){
+    font-size: 16px;
+    font-family: PingFang SC;
+    font-weight: 400;
+    color: #666666;
+    line-height: 24px;
+    text-align: center;
+    margin-bottom: 20px;
+  }
+}
 
 </style>

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

@@ -2,7 +2,7 @@
   <div class="eniting">
     <!-- 头部 -->
     <div class="eniting_header">
-      <p class="p">表编辑</p>
+      <!-- <p class="p">表编辑</p> -->
       <div class="ppl">
        <p v-for="(item,index) in tabldie" :key="index" @click="enditTab(index)">
           <img src="../../../assets/images/icon_tbtab_normal.png" alt="" class="index_headerImg" v-if="num !== index">
@@ -12,7 +12,7 @@
       </div>
       <el-divider></el-divider>
       <div class="table_headerBtun" v-if="queryData.buttonList">
-           <el-button type="primary" plain v-for="(item,indexss) in queryData.buttonList.split('')" :key="keyname + indexss" @click="handleQuery(item)">{{item | btnConversion}}</el-button>
+           <el-button type="primary" size="small" plain v-for="(item,indexss) in queryData.buttonList.split('')" :key="keyname + indexss" @click="handleQuery(item)">{{item | btnConversion}}</el-button>
       </div>
     </div>
     <!-- 内容 -->
@@ -279,7 +279,7 @@
       },
       //删除
       handleDelete(index) {
-        this.$confirm('是否确认删除名称为"' + index.table + '"的数据项?', "警告", {
+        this.$confirm('是否确认删除', "警告", {
             confirmButtonText: "确定",
             cancelButtonText: "取消",
             type: "warning"

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

@@ -2,7 +2,7 @@
   <div class="tabForm">
     <div class="tabForm_header">
       <div class="table_headerBtun" v-if="queryData.buttonList">
-        <el-button type="primary" plain @click="handleQuery(item)" v-for="(item,index) in queryData.buttonList.split('')" :key="index">{{item | btnConversion}}</el-button>
+        <el-button type="primary" size="small" plain @click="handleQuery(item)" v-for="(item,index) in queryData.buttonList.split('')" :key="index">{{item | btnConversion}}</el-button>
       </div>
     </div>
     <!-- 内容 -->
@@ -328,7 +328,7 @@
      },
      //删除
      handleDelete(index) {
-       this.$confirm('是否确认删除名称为"' + index.table + '"的数据项?', "警告", {
+       this.$confirm('是否确认删除', "警告", {
            confirmButtonText: "确定",
            cancelButtonText: "取消",
            type: "warning"

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

@@ -4,7 +4,7 @@
       <!-- <p>单表</p>
       <el-divider></el-divider> -->
       <div class="table_headerBtun" v-if="queryData.buttonList">
-        <el-button type="primary" plain @click="headerBtn(item)" v-for="(item,index) in queryData.buttonList.split('')"
+        <el-button type="primary" plain @click="headerBtn(item)" size="small" v-for="(item,index) in queryData.buttonList.split('')"
           :key="index">{{item | btnConversion}}</el-button>
       </div>
       <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch">

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

@@ -1,10 +1,10 @@
 <template>
   <div class="table_total">
     <div class="table_header">
-      <p>单表</p>
-      <el-divider></el-divider>
+      <!-- <p>单表</p>
+      <el-divider></el-divider> -->
       <div class="table_headerBtun" v-if="queryData.buttonList">
-        <el-button type="primary" plain v-for="(item,index) in queryData.buttonList.split('')" :key="index" @click="handleQuery(item)">{{item | btnConversion}}</el-button>
+        <el-button type="primary" size="small"  plain v-for="(item,index) in queryData.buttonList.split('')" :key="index" @click="handleQuery(item)">{{item | btnConversion}}</el-button>
       </div>
     </div>
     <!-- 内容 -->
@@ -244,7 +244,7 @@
       },
       //删除
       handleDelete(index) {
-        this.$confirm('是否确认删除名称为"' + index + '"的数据项?', "警告", {
+        this.$confirm('是否确认删除', "警告", {
             confirmButtonText: "确定",
             cancelButtonText: "取消",
             type: "warning"