xwl2023/Yi.Framework
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore: 构建稳定版本

Browse Source
This commit is contained in:
陈淳
2023-12-11 09:55:12 +08:00
parent 098d4bc85f
commit 769a6a9c63
756 changed files with 10431 additions and 19867 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Yi.RuoYi.Vue3/src/views/system/config/index.vue
View File

@@ -134,8 +134,8 @@
<pagination
v-show="total > 0"
:total="Number(total)"
v-model:page="queryParams.pageNum"
v-model:limit="queryParams.pageSize"
v-model:page="queryParams.skipCount"
v-model:limit="queryParams.maxResultCount"
@pagination="getList"
/>
@@ -194,8 +194,8 @@ const dateRange = ref([]);
const data = reactive({
form: {},
queryParams: {
pageNum: 1,
pageSize: 10,
skipCount: 1,
maxResultCount: 10,
configName: undefined,
configKey: undefined,
configType: undefined
@@ -214,7 +214,7 @@ function getList() {
loading.value = true;
listConfig(proxy.addDateRange(queryParams.value, dateRange.value)).then(response => {
configList.value = response.data.items;
total.value = response.data.total;
total.value = response.data.totalCount;
loading.value = false;
});
}
@@ -238,7 +238,7 @@ function reset() {
}
/** 搜索按钮操作 */
function handleQuery() {
queryParams.value.pageNum = 1;
queryParams.value.skipCount = 1;
getList();
}
/** 重置按钮操作 */

14
Yi.RuoYi.Vue3/src/views/system/dict/data.vue
View File

@@ -128,8 +128,8 @@
<pagination
v-show="total > 0"
:total="Number(total)"
v-model:page="queryParams.pageNum"
v-model:limit="queryParams.pageSize"
v-model:page="queryParams.skipCount"
v-model:limit="queryParams.maxResultCount"
@pagination="getList"
/>
@@ -213,8 +213,8 @@ const listClassOptions = ref([
const data = reactive({
form: {},
queryParams: {
pageNum: 1,
pageSize: 10,
skipCount: 1,
maxResultCount: 10,
dictName: undefined,
dictType: undefined,
state: true
@@ -248,7 +248,7 @@ function getList() {
loading.value = true;
listData(queryParams.value).then(response => {
dataList.value = response.data.items;
total.value = response.data.total;
total.value = response.data.totalCount;
loading.value = false;
});
}
@@ -273,7 +273,7 @@ function reset() {
}
/** 搜索按钮操作 */
function handleQuery() {
queryParams.value.pageNum = 1;
queryParams.value.skipCount = 1;
getList();
}
/** 返回按钮操作 */
@@ -350,6 +350,6 @@ function handleExport() {
}, `dict_data_${new Date().getTime()}.xlsx`);
}
getTypes(route.params && route.params.dictId);
getTypes(route.query && route.query.dictId);
getTypeList();
</script>

29
Yi.RuoYi.Vue3/src/views/system/dict/index.vue
View File

@@ -107,9 +107,10 @@
<el-table-column label="字典名称" align="center" prop="dictName" :show-overflow-tooltip="true"/>
<el-table-column label="字典类型" align="center" :show-overflow-tooltip="true">
<template #default="scope">
<router-link :to="'/system/dict-data/index/' + scope.row.id" class="link-type">
<span>{{ scope.row.dictType }}</span>
</router-link>
<!-- <router-link :to="'/system/dict-data/index/' + scope.row.id" class="link-type">
</router-link> -->
<span @click="handleToPath(scope.row.id)">{{ scope.row.dictType }}</span>
</template>
</el-table-column>
<el-table-column label="状态" align="center" prop="state">
@@ -145,8 +146,8 @@
<pagination
v-show="total > 0"
:total="Number(total)"
v-model:page="queryParams.pageNum"
v-model:limit="queryParams.pageSize"
v-model:page="queryParams.skipCount"
v-model:limit="queryParams.maxResultCount"
@pagination="getList"
/>
@@ -181,6 +182,7 @@
<script setup name="Dict">
import useDictStore from '@/store/modules/dict'
import { listType, getType, delType, addType, updateType, refreshCache } from "@/api/system/dict/type";
import router from '../../../router';
const { proxy } = getCurrentInstance();
const { sys_normal_disable } = proxy.useDict("sys_normal_disable");
@@ -199,8 +201,8 @@ const dateRange = ref([]);
const data = reactive({
form: {},
queryParams: {
pageNum: 1,
pageSize: 10,
skipCount: 1,
maxResultCount: 10,
dictName: undefined,
dictType: undefined,
state: true
@@ -218,7 +220,7 @@ function getList() {
loading.value = true;
listType(proxy.addDateRange(queryParams.value, dateRange.value)).then(response => {
typeList.value = response.data.items;
total.value = response.data.total;
total.value = response.data.totalCount;
loading.value = false;
});
}
@@ -234,7 +236,7 @@ function reset() {
}
/** 搜索按钮操作 */
function handleQuery() {
queryParams.value.pageNum = 1;
queryParams.value.skipCount = 1;
getList();
}
/** 重置按钮操作 */
@@ -310,4 +312,13 @@ function handleRefreshCache() {
}
getList();
const handleToPath = (id) => {
router.push({
path:'/system/dict-data/index',
query:{
dictId:id
}
})
}
</script>

10
Yi.RuoYi.Vue3/src/views/system/menu/index.vue
View File

@@ -310,13 +310,14 @@ const refreshTable = ref(true);
const showChooseIcon = ref(false);
const iconSelectRef = ref(null);
const guidEmpty="00000000-0000-0000-0000-000000000000";
const data = reactive({
form: {
},
queryParams: {
menuName: undefined,
visible: undefined
visible: true
},
rules: {
menuName: [{ required: true, message: "菜单名称不能为空", trigger: "blur" }],
@@ -330,6 +331,7 @@ const { queryParams, form, rules } = toRefs(data);
/** 查询菜单列表 */
function getList() {
loading.value = true;
console.log(queryParams.value,"queryParams.value");
listMenu(queryParams.value).then(response => {
menuList.value = proxy.handleTree(response.data.items, "id");
loading.value = false;
@@ -339,7 +341,7 @@ function getList() {
function getTreeselect() {
menuOptions.value = [];
listMenu().then(response => {
const menu = { id: 0, menuName: "主类目", children: [] };
const menu = { id: guidEmpty, menuName: "主类目", children: [] };
menu.children = proxy.handleTree(response.data.items, "id");
menuOptions.value.push(menu);
});
@@ -353,7 +355,7 @@ function cancel() {
function reset() {
form.value = {
id: undefined,
parentId: 0,
parentId: guidEmpty,
menuName: undefined,
menuIcon: undefined,
menuType: 0,
@@ -399,7 +401,7 @@ function handleAdd(row) {
if (row != null && row.id) {
form.value.parentId = row.id;
} else {
form.value.parentId = 0;
form.value.parentId = "00000000-0000-0000-0000-000000000000";
}
open.value = true;
title.value = "添加菜单";

10
Yi.RuoYi.Vue3/src/views/system/notice/index.vue
View File

@@ -112,8 +112,8 @@
<pagination
v-show="total > 0"
:total="Number(total)"
v-model:page="queryParams.pageNum"
v-model:limit="queryParams.pageSize"
v-model:page="queryParams.skipCount"
v-model:limit="queryParams.maxResultCount"
@pagination="getList"
/>
@@ -190,8 +190,8 @@ const title = ref("");
const data = reactive({
form: {},
queryParams: {
pageNum: 1,
pageSize: 10,
skipCount: 1,
maxResultCount: 10,
noticeTitle: undefined,
createBy: undefined,
status: undefined
@@ -231,7 +231,7 @@ function reset() {
}
/** 搜索按钮操作 */
function handleQuery() {
queryParams.value.pageNum = 1;
queryParams.value.skipCount = 1;
getList();
}
/** 重置按钮操作 */

12
Yi.RuoYi.Vue3/src/views/system/post/index.vue
View File

@@ -112,8 +112,8 @@
<pagination
v-show="total > 0"
:total="Number(total)"
v-model:page="queryParams.pageNum"
v-model:limit="queryParams.pageSize"
v-model:page="queryParams.skipCount"
v-model:limit="queryParams.maxResultCount"
@pagination="getList"
/>
@@ -167,8 +167,8 @@ const title = ref("");
const data = reactive({
form: {},
queryParams: {
pageNum: 1,
pageSize: 10,
skipCount: 1,
maxResultCount: 10,
postCode: undefined,
postName: undefined,
state: undefined
@@ -187,7 +187,7 @@ function getList() {
loading.value = true;
listPost(queryParams.value).then(response => {
postList.value = response.data.items;
total.value = response.data.total;
total.value = response.data.totalCount;
loading.value = false;
});
}
@@ -210,7 +210,7 @@ function reset() {
}
/** 搜索按钮操作 */
function handleQuery() {
queryParams.value.pageNum = 1;
queryParams.value.skipCount = 1;
getList();
}
/** 重置按钮操作 */

12
Yi.RuoYi.Vue3/src/views/system/role/authUser.vue
View File

@@ -88,8 +88,8 @@
<pagination
v-show="total > 0"
:total="Number(total)"
v-model:page="queryParams.pageNum"
v-model:limit="queryParams.pageSize"
v-model:page="queryParams.skipCount"
v-model:limit="queryParams.maxResultCount"
@pagination="getList"
/>
<select-user ref="selectRef" :roleId="queryParams.roleId" @ok="handleQuery" />
@@ -112,8 +112,8 @@ const total = ref(0);
const userIds = ref([]);
const queryParams = reactive({
pageNum: 1,
pageSize: 10,
skipCount: 1,
maxResultCount: 10,
roleId: route.params.roleId,
userName: undefined,
phone: undefined,
@@ -124,7 +124,7 @@ function getList() {
loading.value = true;
allocatedUserList(queryParams.roleId,queryParams).then(response => {
userList.value = response.data.items;
total.value = response.data.total;
total.value = response.data.totalCount;
loading.value = false;
});
}
@@ -135,7 +135,7 @@ function handleClose() {
}
/** 搜索按钮操作 */
function handleQuery() {
queryParams.pageNum = 1;
queryParams.skipCount = 1;
getList();
}
/** 重置按钮操作 */

10
Yi.RuoYi.Vue3/src/views/system/role/index.vue
View File

@@ -82,7 +82,7 @@
</el-table-column>
</el-table>
<pagination v-show="total > 0" :total="Number(total)" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize"
<pagination v-show="total > 0" :total="Number(total)" v-model:page="queryParams.skipCount" v-model:limit="queryParams.maxResultCount"
@pagination="getList" />
<!-- 添加或修改角色配置对话框 -->
@@ -222,8 +222,8 @@ const data = reactive({
form: {
},
queryParams: {
pageNum: 1,
pageSize: 10,
skipCount: 1,
maxResultCount: 10,
roleName: undefined,
roleCode: undefined,
state: undefined,
@@ -249,14 +249,14 @@ function getList() {
listRole(proxy.addDateRange(queryParams.value, dateRange.value)).then(
(response) => {
roleList.value = response.data.items;
total.value = response.data.total;
total.value = response.data.totalCount;
loading.value = false;
}
);
}
/** 搜索按钮操作 */
function handleQuery() {
queryParams.value.pageNum = 1;
queryParams.value.skipCount = 1;
getList();
}
/** 重置按钮操作 */

10
Yi.RuoYi.Vue3/src/views/system/role/selectUser.vue
View File

@@ -44,8 +44,8 @@
<pagination
v-show="total > 0"
:total="Number(total)"
v-model:page="queryParams.pageNum"
v-model:limit="queryParams.pageSize"
v-model:page="queryParams.skipCount"
v-model:limit="queryParams.maxResultCount"
@pagination="getList"
/>
</el-row>
@@ -76,8 +76,8 @@ const total = ref(0);
const userIds = ref([]);
const queryParams = reactive({
pageNum: 1,
pageSize: 10,
skipCount: 1,
maxResultCount: 10,
roleId: undefined,
userName: undefined,
phone: undefined
@@ -106,7 +106,7 @@ function getList() {
}
/** 搜索按钮操作 */
function handleQuery() {
queryParams.pageNum = 1;
queryParams.skipCount = 1;
getList();
}
/** 重置按钮操作 */

10
Yi.RuoYi.Vue3/src/views/system/user/authRole.vue
View File

@@ -17,10 +17,10 @@
</el-form>
<h4 class="form-header h4">角色信息</h4>
<el-table v-loading="loading" :row-key="getRowKey" @row-click="clickRow" ref="roleRef" @selection-change="handleSelectionChange" :data="roles.slice((pageNum - 1) * pageSize, pageNum * pageSize)">
<el-table v-loading="loading" :row-key="getRowKey" @row-click="clickRow" ref="roleRef" @selection-change="handleSelectionChange" :data="roles.slice((skipCount - 1) * maxResultCount, skipCount * maxResultCount)">
<el-table-column label="序号" width="55" type="index" align="center">
<template #default="scope">
<span>{{ (pageNum - 1) * pageSize + scope.$index + 1 }}</span>
<span>{{ (skipCount - 1) * maxResultCount + scope.$index + 1 }}</span>
</template>
</el-table-column>
<el-table-column type="selection" :reserve-selection="true" width="55"></el-table-column>
@@ -34,7 +34,7 @@
</el-table-column>
</el-table>
<pagination v-show="total > 0" :total="Number(total)" v-model:page="pageNum" v-model:limit="pageSize" />
<pagination v-show="total > 0" :total="Number(total)" v-model:page="skipCount" v-model:limit="maxResultCount" />
<el-form label-width="100px">
<div style="text-align: center;margin-left:-120px;margin-top:30px;">
@@ -53,8 +53,8 @@ const { proxy } = getCurrentInstance();
const loading = ref(true);
const total = ref(0);
const pageNum = ref(1);
const pageSize = ref(10);
const skipCount = ref(1);
const maxResultCount = ref(10);
const roleIds = ref([]);
const roles = ref([]);
const form = ref({

12
Yi.RuoYi.Vue3/src/views/system/user/index.vue
View File

@@ -107,8 +107,8 @@
</template>
</el-table-column>
</el-table>
<pagination v-show="total > 0" :total="Number(total)" v-model:page="queryParams.pageNum"
v-model:limit="queryParams.pageSize" @pagination="getList" />
<pagination v-show="total > 0" :total="Number(total)" v-model:page="queryParams.skipCount"
v-model:limit="queryParams.maxResultCount" @pagination="getList" />
</el-col>
</el-row>
@@ -291,8 +291,8 @@ const data = reactive({
form : {
},
queryParams: {
pageNum: 1,
pageSize: 10,
skipCount: 1,
maxResultCount: 10,
userName: undefined,
phone: undefined,
state: true,
@@ -337,7 +337,7 @@ function getList() {
loading.value = false;
userList.value = res.data.items;
total.value = res.data.total;
total.value = res.data.totalCount;
});
};
/** 节点单击事件 */
@@ -347,7 +347,7 @@ function handleNodeClick(data) {
};
/** 搜索按钮操作 */
function handleQuery() {
queryParams.value.pageNum = 1;
queryParams.value.skipCount = 1;
getList();
};
/** 重置按钮操作 */