Merge branch 'dev' of https://gitee.com/xlsea/ruoyi-plus-soybean into flow
This commit is contained in:
commit
3629c7a9dd
9
docs/template/index-tree.vue.vm
vendored
9
docs/template/index-tree.vue.vm
vendored
@ -1,4 +1,3 @@
|
||||
#set($scrollX = $columns.size() * 120 + 242)
|
||||
<script setup lang="tsx">
|
||||
import { NDivider } from 'naive-ui';
|
||||
import { jsonClone } from '@sa/utils';
|
||||
@ -57,12 +56,6 @@ const {
|
||||
align: 'center',
|
||||
width: 48
|
||||
},
|
||||
{
|
||||
key: 'index',
|
||||
title: $t('common.index'),
|
||||
align: 'center',
|
||||
width: 64
|
||||
},
|
||||
#foreach ($column in $columns)
|
||||
#if($column.list)
|
||||
{
|
||||
@ -208,7 +201,7 @@ function handleExport() {
|
||||
size="small"
|
||||
:indent="32"
|
||||
:flex-height="!appStore.isMobile"
|
||||
:scroll-x="$scrollX"
|
||||
:scroll-x="962"
|
||||
:loading="loading"
|
||||
remote
|
||||
:row-key="row => row.#foreach($column in $columns)#if($column.isPk == '1')$column.javaField#end#end"
|
||||
|
3
docs/template/index.vue.vm
vendored
3
docs/template/index.vue.vm
vendored
@ -1,4 +1,3 @@
|
||||
#set($scrollX = $columns.size() * 120 + 242)
|
||||
<script setup lang="tsx">
|
||||
import { NDivider } from 'naive-ui';
|
||||
import { fetchBatchDelete${BusinessName}, fetchGet${BusinessName}List } from '@/service/api/${moduleName}/${businessName}';
|
||||
@ -171,7 +170,7 @@ function handleExport() {
|
||||
:data="data"
|
||||
size="small"
|
||||
:flex-height="!appStore.isMobile"
|
||||
:scroll-x="$scrollX"
|
||||
:scroll-x="962"
|
||||
:loading="loading"
|
||||
remote
|
||||
:row-key="row => row.#foreach($column in $columns)#if($column.isPk == '1')$column.javaField#end#end"
|
||||
|
@ -135,7 +135,7 @@ const {
|
||||
text
|
||||
type="primary"
|
||||
icon="material-symbols:database"
|
||||
tooltipContent="数据范权限"
|
||||
tooltipContent="数据范围权限"
|
||||
onClick={() => handleDataScope(row)}
|
||||
/>
|
||||
);
|
||||
|
Loading…
Reference in New Issue
Block a user