jiangyc/ruoyi-plus-soybean
1
0
Fork 0
mirror of https://github.com/m-xlsea/ruoyi-plus-soybean.git synced 2025-09-24 07:49:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' of https://gitee.com/xlsea/ruoyi-plus-soybean into flow

Browse Source
This commit is contained in:
AN
2025-05-30 17:28:44 +08:00
parent 89a2a6cbf4 8fa9d11a89
commit 3629c7a9dd
3 changed files with 3 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
docs/template/index-tree.vue.vm vendored
View File

@ -1,4 +1,3 @@
#set($scrollX = $columns.size() * 120 + 242)
<script setup lang="tsx"> <script setup lang="tsx">
import { NDivider } from 'naive-ui'; import { NDivider } from 'naive-ui';
import { jsonClone } from '@sa/utils'; import { jsonClone } from '@sa/utils';
@ -57,12 +56,6 @@ const {
align: 'center', align: 'center',
width: 48 width: 48
}, },
{
key: 'index',
title: $t('common.index'),
align: 'center',
width: 64
},
#foreach ($column in $columns) #foreach ($column in $columns)
#if($column.list) #if($column.list)
{ {
@ -208,7 +201,7 @@ function handleExport() {
size="small" size="small"
:indent="32" :indent="32"
:flex-height="!appStore.isMobile" :flex-height="!appStore.isMobile"
:scroll-x="$scrollX" :scroll-x="962"
:loading="loading" :loading="loading"
remote remote
:row-key="row => row.#foreach($column in $columns)#if($column.isPk == '1')$column.javaField#end#end" :row-key="row => row.#foreach($column in $columns)#if($column.isPk == '1')$column.javaField#end#end"

3
docs/template/index.vue.vm vendored
View File

@ -1,4 +1,3 @@
#set($scrollX = $columns.size() * 120 + 242)
<script setup lang="tsx"> <script setup lang="tsx">
import { NDivider } from 'naive-ui'; import { NDivider } from 'naive-ui';
import { fetchBatchDelete${BusinessName}, fetchGet${BusinessName}List } from '@/service/api/${moduleName}/${businessName}'; import { fetchBatchDelete${BusinessName}, fetchGet${BusinessName}List } from '@/service/api/${moduleName}/${businessName}';
@ -171,7 +170,7 @@ function handleExport() {
:data="data" :data="data"
size="small" size="small"
:flex-height="!appStore.isMobile" :flex-height="!appStore.isMobile"
:scroll-x="$scrollX" :scroll-x="962"
:loading="loading" :loading="loading"
remote remote
:row-key="row => row.#foreach($column in $columns)#if($column.isPk == '1')$column.javaField#end#end" :row-key="row => row.#foreach($column in $columns)#if($column.isPk == '1')$column.javaField#end#end"

2
src/views/system/role/index.vue
View File

@ -135,7 +135,7 @@ const {
text text
type="primary" type="primary"
icon="material-symbols:database" icon="material-symbols:database"
tooltipContent="数据范权限" tooltipContent="数据范围权限"
onClick={() => handleDataScope(row)} onClick={() => handleDataScope(row)}
/> />
); );