【更新】更新版本v1.3.2 具体可看readme更新日志

README.md

@@ -214,6 +214,14 @@ jodconverter:
 
 ### 更新日志：
 
+#### v1.3.2
+- 1、【bug修复】修复一个代码生成bug
+- 2、【修复】新增数据时，若手动设置了创建人和创建时间，则不去设置创建人和创建时间
+- 3、【修复】前端传入token为undefined时，判断为无效
+- 4、【新增】新增XCard组件，为列表查询区域统一样式
+- 5、【修改】更改所有列表界面默认为“紧凑”
+- 6、【修改】更改所有列表界面查询区域与列表在不同card显示
+
 #### v1.3.1
 - 1、【更新】更换新版logo，小诺更有朝气
 - 2、【更新】更新ip地址定位描述

_web/src/components/Table/README.md

@@ -21,7 +21,6 @@ Table 重封装组件说明
 <template>
   <s-table
     ref="table"
-    size="default"
     :rowKey="(record) => record.data.id"
     :columns="columns"
     :data="loadData"
@@ -102,7 +101,6 @@ Table 重封装组件说明
 <template>
   <s-table
     ref="table"
-    size="default"
     :columns="columns"
     :data="loadData"
   >

_web/src/components/Table/index.js

@@ -1,6 +1,5 @@
 import T from 'ant-design-vue/es/table/Table'
 import get from 'lodash.get'
-import screenfull from 'screenfull'
 import draggable from 'vuedraggable'
 import columnSetting from './columnSetting'
 import './index.less'
@@ -47,7 +46,7 @@ export default {
     },
     size: {
       type: String,
-      default: 'default'
+      default: 'middle'
     },
     /**
      * alert: {
@@ -331,20 +330,6 @@ export default {
           },
           onClick: () => {
           }
-        },
-        {
-          icon: this.isFullscreen ? 'fullscreen-exit' : 'fullscreen',
-          title: '全屏',
-          onClick: () => {
-            if (screenfull.isEnabled) {
-              const table = document.querySelector('.table-wrapper')
-              const antdCard = table.parentNode.parentNode
-              if (antdCard.classList.contains('ant-card')) {
-                screenfull.toggle(antdCard)
-                this.isFullscreen = !this.isFullscreen
-              }
-            }
-          }
         }
       ]
       if (this.extraTool.length) {

_web/src/views/gen/codeGenerate/index.vue

@@ -23,7 +23,6 @@
       <a-spin :spinning="Loading">
         <s-table
           ref="table"
-          size="default"
           :columns="columns"
           :data="loadData"
           :alert="true"

_web/src/views/system/app/index.vue

@@ -1,8 +1,8 @@
 /* eslint-disable eqeqeq */
 <template>
-  <a-card :bordered="false" >
+  <div>
-    <a-spin :spinning="loading">
+    <x-card v-if="hasPerm('sysApp:page')">
-      <div class="table-page-search-wrapper" v-if="hasPerm('sysApp:page')">
+      <div slot="content" class="table-page-search-wrapper">
         <a-form layout="inline">
           <a-row :gutter="48">
             <a-col :md="8" :sm="24">
@@ -24,9 +24,11 @@
           </a-row>
         </a-form>
       </div>
+    </x-card>
+    <a-card :bordered="false" >
+      <a-spin :spinning="loading">
         <s-table
           ref="table"
-        size="default"
           :columns="columns"
           :data="loadData"
           :alert="true"
@@ -58,15 +60,17 @@
         <edit-form ref="editForm" @ok="handleOk" />
       </a-spin>
     </a-card>
+  </div>
 </template>
 <script>
-  import { STable } from '@/components'
+  import { STable, XCard } from '@/components'
   import { getAppPage, sysAppDelete, sysAppSetAsDefault } from '@/api/modular/system/appManage'
   import { sysDictTypeDropDown } from '@/api/modular/system/dictManage'
   import editForm from './editForm'
   import addForm from './addForm'
   export default {
     components: {
+      XCard,
       STable,
       editForm,
       addForm
@@ -105,6 +109,7 @@
             scopedSlots: { customRender: 'status' }
           }
         ],
+        tstyle: { 'padding-bottom': '0px', 'margin-bottom': '10px' },
         // 加载数据方法 必须为 Promise 对象
         loadData: parameter => {
           return getAppPage(Object.assign(parameter, this.queryParam)).then((res) => {

_web/src/views/system/config/index.vue

@@ -1,6 +1,7 @@
 <template>
-  <a-card :bordered="false">
+  <div>
-    <div class="table-page-search-wrapper" v-if="hasPerm('sysConfig:page')">
+    <x-card v-if="hasPerm('sysConfig:page')">
+      <div slot="content" class="table-page-search-wrapper" >
         <a-form layout="inline">
           <a-row :gutter="48">
             <a-col :md="8" :sm="24">
@@ -35,9 +36,10 @@
           </a-row>
         </a-form>
       </div>
+    </x-card>
+    <a-card :bordered="false">
       <s-table
         ref="table"
-      size="default"
         :columns="columns"
         :data="loadData"
         :alert="true"
@@ -73,15 +75,17 @@
       <add-form ref="addForm" @ok="handleOk" v-if="hasPerm('sysConfig:add')"/>
       <edit-form ref="editForm" @ok="handleOk" v-if="hasPerm('sysConfig:edit')"/>
     </a-card>
+  </div>
 </template>
 <script>
-  import { STable, Ellipsis } from '@/components'
+  import { STable, Ellipsis, XCard } from '@/components'
   import { sysConfigPage, sysConfigDelete } from '@/api/modular/system/configManage'
   import { sysDictTypeDropDown } from '@/api/modular/system/dictManage'
   import addForm from './addForm'
   import editForm from './editForm'
   export default {
     components: {
+      XCard,
       STable,
       Ellipsis,
       addForm,

_web/src/views/system/dict/dictdata/index.vue

@@ -6,8 +6,8 @@
     :footer="null"
     @cancel="handleCancel"
   >
-    <a-card :bordered="false">
+    <x-card v-if="hasPerm('sysDictData:page')">
-      <div class="table-page-search-wrapper" v-if="hasPerm('sysDictData:page')">
+      <div slot="content" class="table-page-search-wrapper" >
         <a-form layout="inline">
           <a-row :gutter="48">
             <a-col :md="8" :sm="24">
@@ -29,9 +29,10 @@
           </a-row>
         </a-form>
       </div>
+    </x-card>
+    <a-card :bordered="false">
       <s-table
         ref="table"
-        size="default"
         :columns="columns"
         :data="loadData"
         :alert="false"
@@ -58,13 +59,14 @@
   </a-modal>
 </template>
 <script>
-  import { STable } from '@/components'
+  import { STable, XCard } from '@/components'
   import { sysDictDataPage, sysDictDataDelete } from '@/api/modular/system/dictDataManage'
   import { sysDictTypeDropDown } from '@/api/modular/system/dictManage'
   import addForm from './addForm'
   import editForm from './editForm'
   export default {
     components: {
+      XCard,
       STable,
       addForm,
       editForm

_web/src/views/system/dict/index.vue

@@ -1,6 +1,7 @@
 <template>
-  <a-card :bordered="false">
+  <div>
-    <div class="table-page-search-wrapper" v-if="hasPerm('sysDictType:page')">
+    <x-card v-if="hasPerm('sysDictType:page')">
+      <div slot="content" class="table-page-search-wrapper">
         <a-form layout="inline">
           <a-row :gutter="48">
             <a-col :md="8" :sm="24">
@@ -22,9 +23,10 @@
           </a-row>
         </a-form>
       </div>
+    </x-card>
+    <a-card :bordered="false">
       <s-table
         ref="table"
-      size="default"
         :columns="columns"
         :data="loadData"
         :alert="false"
@@ -61,15 +63,17 @@
       <edit-form ref="editForm" @ok="handleOk" />
       <data-index ref="dataIndex" @ok="handleOk" />
     </a-card>
+  </div>
 </template>
 <script>
-  import { STable } from '@/components'
+  import { STable, XCard } from '@/components'
   import { sysDictTypePage, sysDictTypeDelete, sysDictTypeDropDown } from '@/api/modular/system/dictManage'
   import addForm from './addForm'
   import editForm from './editForm'
   import dataIndex from './dictdata/index'
   export default {
     components: {
+      XCard,
       STable,
       addForm,
       editForm,

_web/src/views/system/file/index.vue

@@ -1,7 +1,7 @@
 <template>
   <a-spin :spinning="cardLoading">
-    <a-card :bordered="false">
+    <x-card v-if="hasPerm('sysFileInfo:page')">
-      <div class="table-page-search-wrapper" v-if="hasPerm('sysFileInfo:page')">
+      <div slot="content" class="table-page-search-wrapper">
         <a-form layout="inline">
           <a-row :gutter="48">
             <a-col :md="8" :sm="24">
@@ -36,20 +36,10 @@
           </a-row>
         </a-form>
       </div>
-      <!--<div class="table-operator" v-if="hasPerm('sysFileInfo:upload')">
+    </x-card>
-        <a-upload
+    <a-card :bordered="false">
-          v-if="hasPerm('sysFileInfo:upload')"
-          name="file"
-          :multiple="true"
-          :customRequest="customRequest"
-          :showUploadList="false"
-        >
-          <a-button> <a-icon type="upload" />上传文件</a-button>
-        </a-upload>
-      </div>-->
       <s-table
         ref="table"
-        size="default"
         :columns="columns"
         :data="loadData"
         :alert="true"
@@ -89,6 +79,8 @@
           </a-popconfirm>
           <a-divider type="vertical" v-if="(hasPerm('sysFileInfo:preview') & record.fileSuffix === 'png' || record.fileSuffix === 'jpeg' || record.fileSuffix === 'jpg'|| record.fileSuffix === 'gif'|| record.fileSuffix === 'tif' || record.fileSuffix === 'bmp' ) & hasPerm('sysFileInfo:delete')"/>
           <a v-if="(hasPerm('sysFileInfo:preview') & record.fileSuffix === 'png' || record.fileSuffix === 'jpeg'|| record.fileSuffix === 'jpg'|| record.fileSuffix === 'gif'|| record.fileSuffix === 'tif' || record.fileSuffix === 'bmp' )" @click="$refs.previewForm.preview(record)">预览</a>
+          <a-divider type="vertical" v-if="(hasPerm('sysFileInfo:preview') & record.fileSuffix === 'doc' || record.fileSuffix === 'docx'|| record.fileSuffix === 'xls'|| record.fileSuffix === 'xlsx') & hasPerm('sysFileInfo:delete')"/>
+          <a v-if="(hasPerm('sysFileInfo:preview') & record.fileSuffix === 'doc' || record.fileSuffix === 'docx'|| record.fileSuffix === 'xls'|| record.fileSuffix === 'xlsx')" @click="previewMicrosoft(record)">预览</a>
         </span>
       </s-table>
       <detail-form ref="detailForm" @ok="handleOk" v-if="hasPerm('sysFileInfo:detail')"/>
@@ -97,13 +89,14 @@
   </a-spin>
 </template>
 <script>
-  import { STable, Ellipsis } from '@/components'
+  import { STable, Ellipsis, XCard } from '@/components'
   import { sysDictTypeDropDown } from '@/api/modular/system/dictManage'
   import { sysFileInfoPage, sysFileInfoDelete, sysFileInfoUpload, sysFileInfoDownload } from '@/api/modular/system/fileManage'
   import detailForm from './detailForm'
   import previewForm from './previewForm'
   export default {
     components: {
+      XCard,
       STable,
       Ellipsis,
       detailForm,
@@ -178,6 +171,12 @@
           return values[0].value
         }
       },
+      /**
+       * 预览文件（微软插件）
+       */
+      previewMicrosoft (record) {
+        window.open('https://view.officeapps.live.com/op/view.aspx?src=' + process.env.VUE_APP_API_BASE_URL + '/sysFileInfo/download?id=' + record.id)
+      },
       /**
        * 获取字典数据
        */

_web/src/views/system/log/oplog/index.vue

@@ -1,6 +1,7 @@
 <template>
-  <a-card :bordered="false">
+  <div>
-    <div class="table-page-search-wrapper" v-if="hasPerm('sysOpLog:page')">
+    <x-card v-if="hasPerm('sysOpLog:page')">
+      <div slot="content" class="table-page-search-wrapper">
         <a-form layout="inline">
           <a-row :gutter="48">
             <a-col :md="8" :sm="24">
@@ -49,9 +50,10 @@
           </a-row>
         </a-form>
       </div>
+    </x-card>
+    <a-card :bordered="false">
       <s-table
         ref="table"
-      size="default"
         :columns="columns"
         :data="loadData"
         :alert="true"
@@ -86,15 +88,17 @@
       </s-table>
       <details-oplog ref="detailsOplog"/>
     </a-card>
+  </div>
 </template>
 <script>
-  import { STable, Ellipsis } from '@/components'
+  import { STable, Ellipsis, XCard } from '@/components'
   import { sysOpLogPage, sysOpLogDelete } from '@/api/modular/system/logManage'
   import detailsOplog from './details'
   import { sysDictTypeDropDown } from '@/api/modular/system/dictManage'
   import moment from 'moment'
   export default {
     components: {
+      XCard,
       STable,
       Ellipsis,
       detailsOplog

_web/src/views/system/log/vislog/index.vue

@@ -1,6 +1,7 @@
 <template>
-  <a-card :bordered="false">
+  <div>
-    <div class="table-page-search-wrapper" v-if="hasPerm('sysVisLog:page')">
+    <x-card v-if="hasPerm('sysVisLog:page')">
+      <div slot="content" class="table-page-search-wrapper">
         <a-form layout="inline">
           <a-row :gutter="48">
             <a-col :md="8" :sm="24">
@@ -49,9 +50,10 @@
           </a-row>
         </a-form>
       </div>
+    </x-card>
+    <a-card :bordered="false">
       <s-table
         ref="table"
-      size="default"
         :columns="columns"
         :data="loadData"
         :alert="true"
@@ -83,15 +85,17 @@
       </s-table>
       <details-vislog ref="detailsVislog"/>
     </a-card>
+  </div>
 </template>
 <script>
-  import { STable, Ellipsis } from '@/components'
+  import { STable, Ellipsis, XCard } from '@/components'
   import { sysVisLogPage, sysVisLogDelete } from '@/api/modular/system/logManage'
   import detailsVislog from './details'
   import { sysDictTypeDropDown } from '@/api/modular/system/dictManage'
   import moment from 'moment'
   export default {
     components: {
+      XCard,
       STable,
       Ellipsis,
       detailsVislog

_web/src/views/system/menu/index.vue

@@ -14,6 +14,7 @@
 
     <a-table
       ref="table"
+      size="middle"
       :rowKey="(record) => record.id"
       :pagination="false"
       :defaultExpandAllRows="true"

_web/src/views/system/notice/index.vue

@@ -1,6 +1,7 @@
 <template>
-  <a-card :bordered="false">
+  <div>
-    <div class="table-page-search-wrapper" v-if="hasPerm('sysNotice:page')">
+    <x-card v-if="hasPerm('sysNotice:page')">
+      <div slot="content" class="table-page-search-wrapper">
         <a-form layout="inline">
           <a-row :gutter="48">
             <a-col :md="8" :sm="24">
@@ -22,9 +23,10 @@
           </a-row>
         </a-form>
       </div>
+    </x-card>
+    <a-card :bordered="false">
       <s-table
         ref="table"
-      size="default"
         :columns="columns"
         :data="loadData"
         :alert="true"
@@ -71,9 +73,10 @@
       <detail-form ref="detailForm" @ok="handleOk" v-if="hasPerm('sysNotice:detail')"/>
       <div ref="editor"></div>
     </a-card>
+  </div>
 </template>
 <script>
-  import { STable } from '@/components'
+  import { STable, XCard } from '@/components'
   import { sysNoticePage, sysNoticeDelete, sysNoticeChangeStatus } from '@/api/modular/system/noticeManage'
   import { sysDictTypeDropDown } from '@/api/modular/system/dictManage'
   import addForm from './addForm'
@@ -81,6 +84,7 @@
   import detailForm from './detailForm'
   export default {
     components: {
+      XCard,
       STable,
       addForm,
       editForm,

_web/src/views/system/noticeReceived/index.vue

@@ -1,6 +1,7 @@
 <template>
-  <a-card :bordered="false">
+  <div>
-    <div class="table-page-search-wrapper" v-if="hasPerm('sysNotice:received')">
+    <x-card v-if="hasPerm('sysNotice:received')">
+      <div slot="content" class="table-page-search-wrapper">
         <a-form layout="inline">
           <a-row :gutter="48">
             <a-col :md="8" :sm="24">
@@ -24,9 +25,10 @@
           </a-row>
         </a-form>
       </div>
+    </x-card>
+    <a-card :bordered="false">
       <s-table
         ref="table"
-      size="default"
         :columns="columns"
         :data="loadData"
         :alert="true"
@@ -46,16 +48,17 @@
       <detail-form ref="detailForm" @ok="handleOk" />
       <div ref="editor"></div>
     </a-card>
+  </div>
 </template>
 <script>
-  import { STable } from '@/components'
+  import { STable, XCard } from '@/components'
   // eslint-disable-next-line no-unused-vars
-  import { sysNoticePage } from '@/api/modular/system/noticeManage'
   import { sysNoticeReceived } from '@/api/modular/system/noticeReceivedManage'
   import { sysDictTypeDropDown } from '@/api/modular/system/dictManage'
   import detailForm from './detailForm'
   export default {
     components: {
+      XCard,
       STable,
       detailForm
     },

_web/src/views/system/onlineUser/index.vue

@@ -2,7 +2,6 @@
   <a-card :bordered="false">
     <s-table
       ref="table"
-      size="default"
       :pagination="false"
       :loading="loading"
       :columns="columns"

_web/src/views/system/org/index.vue

@@ -18,8 +18,8 @@
       </a-card>
     </a-col>
     <a-col :md="19" :sm="24">
-      <a-card :bordered="false">
+      <x-card v-if="hasPerm('sysOrg:page')">
-        <div class="table-page-search-wrapper" v-if="hasPerm('sysOrg:page')">
+        <div slot="content" class="table-page-search-wrapper">
           <a-form layout="inline">
             <a-row :gutter="48">
               <a-col :md="8" :sm="24">
@@ -36,9 +36,10 @@
             </a-row>
           </a-form>
         </div>
+      </x-card>
+      <a-card :bordered="false">
         <s-table
           ref="table"
-          size="default"
           :columns="columns"
           :data="loadData"
           :alert="true"
@@ -63,13 +64,14 @@
   </a-row>
 </template>
 <script>
-  import { STable } from '@/components'
+  import { STable, XCard } from '@/components'
   import { Empty } from 'ant-design-vue'
   import { getOrgPage, sysOrgDelete, getOrgTree } from '@/api/modular/system/orgManage'
   import addForm from './addForm'
   import editForm from './editForm'
   export default {
     components: {
+      XCard,
       STable,
       addForm,
       editForm

_web/src/views/system/pos/index.vue

@@ -1,6 +1,7 @@
 <template>
-  <a-card :bordered="false">
+  <div>
-    <div class="table-page-search-wrapper" v-if="hasPerm('sysPos:page')">
+    <x-card v-if="hasPerm('sysPos:page')">
+      <div slot="content" class="table-page-search-wrapper">
         <a-form layout="inline">
           <a-row :gutter="48">
             <a-col :md="8" :sm="24">
@@ -22,9 +23,10 @@
           </a-row>
         </a-form>
       </div>
+    </x-card>
+    <a-card :bordered="false">
       <s-table
         ref="table"
-      size="default"
         :columns="columns"
         :data="loadData"
         :alert="true"
@@ -48,16 +50,18 @@
       <edit-form ref="editForm" @ok="handleOk" />
 
     </a-card>
+  </div>
 </template>
 
 <script>
-  import { STable } from '@/components'
+  import { STable, XCard } from '@/components'
   import { sysPosPage, sysPosDelete } from '@/api/modular/system/posManage'
   import addForm from './addForm'
   import editForm from './editForm'
 
   export default {
     components: {
+      XCard,
       STable,
       addForm,
       editForm

_web/src/views/system/role/index.vue

@@ -1,6 +1,7 @@
 <template>
-  <a-card :bordered="false">
+  <div>
-    <div class="table-page-search-wrapper" v-if="hasPerm('sysRole:page')">
+    <x-card v-if="hasPerm('sysRole:page')">
+      <div slot="content" class="table-page-search-wrapper">
         <a-form layout="inline">
           <a-row :gutter="48">
             <a-col :md="8" :sm="24">
@@ -20,9 +21,10 @@
           </a-row>
         </a-form>
       </div>
+    </x-card>
+    <a-card :bordered="false">
       <s-table
         ref="table"
-      size="default"
         :columns="columns"
         :data="loadData"
         :alert="true"
@@ -63,18 +65,19 @@
       <role-org-form ref="roleOrgForm" @ok="handleOk"/>
 
     </a-card>
+  </div>
 </template>
 
 <script>
-  import { STable } from '@/components'
+  import { STable, XCard } from '@/components'
   import { getRolePage, sysRoleDelete } from '@/api/modular/system/roleManage'
   import addForm from './addForm'
   import editForm from './editForm'
   import roleMenuForm from './roleMenuForm'
   import roleOrgForm from './roleOrgForm'
-
   export default {
     components: {
+      XCard,
       STable,
       addForm,
       editForm,

_web/src/views/system/sms/index.vue

@@ -1,6 +1,7 @@
 <template>
-  <a-card :bordered="false">
+  <div>
-    <div class="table-page-search-wrapper" v-if="hasPerm('sysSms:page')">
+    <x-card v-if="hasPerm('sysSms:page')">
+      <div slot="content" class="table-page-search-wrapper">
         <a-form layout="inline">
           <a-row :gutter="48">
             <a-col :md="8" :sm="24">
@@ -37,9 +38,10 @@
           </a-row>
         </a-form>
       </div>
+    </x-card>
+    <a-card :bordered="false">
       <s-table
         ref="table"
-      size="default"
         :columns="columns"
         :data="loadData"
         :alert="true"
@@ -54,13 +56,15 @@
         </span>
       </s-table>
     </a-card>
+  </div>
 </template>
 <script>
-  import { STable } from '@/components'
+  import { STable, XCard } from '@/components'
   import { smsPage } from '@/api/modular/system/smsManage'
   import { sysDictTypeDropDown } from '@/api/modular/system/dictManage'
   export default {
     components: {
+      XCard,
       STable
     },
     data () {

_web/src/views/system/timers/index.vue

@@ -1,6 +1,7 @@
 <template>
-  <a-card :bordered="false">
+  <div>
-    <div class="table-page-search-wrapper" v-if="hasPerm('sysTimers:page')">
+    <x-card v-if="hasPerm('sysTimers:page')">
+      <div slot="content" class="table-page-search-wrapper">
         <a-form layout="inline">
           <a-row :gutter="48">
             <a-col :md="8" :sm="24">
@@ -22,9 +23,10 @@
           </a-row>
         </a-form>
       </div>
+    </x-card>
+    <a-card :bordered="false">
       <s-table
         ref="table"
-      size="default"
         :columns="columns"
         :data="loadData"
         :alert="true"
@@ -61,9 +63,10 @@
       <add-form ref="addForm" @ok="handleOk" />
       <edit-form ref="editForm" @ok="handleOk" />
     </a-card>
+  </div>
 </template>
 <script>
-  import { STable, Ellipsis } from '@/components'
+  import { STable, Ellipsis, XCard } from '@/components'
   import { sysTimersPage, sysTimersDelete, sysTimersStart, sysTimersStop } from '@/api/modular/system/timersManage'
   import addForm from './addForm'
   import editForm from './editForm'
@@ -71,6 +74,7 @@
   export default {
     name: 'PosIndex',
     components: {
+      XCard,
       STable,
       Ellipsis,
       addForm,

_web/src/views/system/user/addForm.vue

@@ -221,6 +221,7 @@
             :wrapperCol="wrapperCol_JG"
           >
             <a-table
+              size="middle"
               :columns="columns"
               :dataSource="data"
               :pagination="false"

_web/src/views/system/user/editForm.vue

@@ -192,6 +192,7 @@
             :wrapperCol="wrapperCol_JG"
           >
             <a-table
+              size="middle"
               :columns="columns"
               :dataSource="data"
               :pagination="false"

_web/src/views/system/user/index.vue

@@ -1,5 +1,4 @@
 <template>
-
   <a-row :gutter="24" >
     <a-col :md="5" :sm="24">
       <a-card :bordered="false" :loading="treeLoading">
@@ -18,9 +17,8 @@
       </a-card>
     </a-col>
     <a-col :md="19" :sm="24">
-      <a-card :bordered="false">
+      <x-card v-if="hasPerm('sysUser:page')">
-
+        <div slot="content" class="table-page-search-wrapper">
-        <div class="table-page-search-wrapper" v-if="hasPerm('sysUser:page')">
           <a-form layout="inline">
             <a-row :gutter="48">
               <a-col :md="8" :sm="24">
@@ -42,9 +40,10 @@
             </a-row>
           </a-form>
         </div>
+      </x-card>
+      <a-card :bordered="false">
         <s-table
           ref="table"
-          size="default"
           :columns="columns"
           :data="loadData"
           :alert="true"
@@ -102,7 +101,7 @@
   </a-row>
 </template>
 <script>
-  import { STable } from '@/components'
+  import { STable, XCard } from '@/components'
   import { Empty } from 'ant-design-vue'
   import { getOrgTree } from '@/api/modular/system/orgManage'
   import { getUserPage, sysUserDelete, sysUserChangeStatus, sysUserResetPwd } from '@/api/modular/system/userManage'
@@ -113,6 +112,7 @@
   import userOrgForm from './userOrgForm'
   export default {
     components: {
+      XCard,
       STable,
       addForm,
       editForm,

_web/src/views/system/user/userRoleForm.vue

@@ -12,6 +12,7 @@
 
       <div>
         <a-table
+          size="middle"
           :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
           :columns="columns"
           :dataSource="loadData"

xiaonuo-base/xiaonuo-gen/src/main/resources/template/index.vue.vm

@@ -102,7 +102,6 @@
     <a-card :bordered="false">
       <s-table
         ref="table"
-        size="default"
         :columns="columns"
         :data="loadData"
         :alert="true"