修改bug

This commit is contained in:
yangjun 2026-02-10 09:20:31 +08:00
parent 1c000fab28
commit e697f76529
6 changed files with 641 additions and 0 deletions

View File

@ -78,6 +78,7 @@ const render = {
width: 30,
height: 30,
style: { marginRight: '5px' },
preview: false,
previewMask: () => {
return h(Icon, { icon: 'ant-design:eye-outlined', size: 20 });
},

View File

@ -0,0 +1,72 @@
import { defHttp } from '/@/utils/http/axios';
import { useMessage } from "/@/hooks/web/useMessage";
const { createConfirm } = useMessage();
enum Api {
list = '/resourcesManagement/nuResourcesManagement/list',
save='/resourcesManagement/nuResourcesManagement/add',
edit='/resourcesManagement/nuResourcesManagement/edit',
deleteOne = '/resourcesManagement/nuResourcesManagement/delete',
deleteBatch = '/resourcesManagement/nuResourcesManagement/deleteBatch',
importExcel = '/resourcesManagement/nuResourcesManagement/importExcel',
exportXls = '/resourcesManagement/nuResourcesManagement/exportXls',
}
/**
* api
* @param params
*/
export const getExportUrl = Api.exportXls;
/**
* api
*/
export const getImportUrl = Api.importExcel;
/**
*
* @param params
*/
export const list = (params) => defHttp.get({ url: Api.list, params });
/**
*
* @param params
* @param handleSuccess
*/
export const deleteOne = (params,handleSuccess) => {
return defHttp.delete({url: Api.deleteOne, params}, {joinParamsToUrl: true}).then(() => {
handleSuccess();
});
}
/**
*
* @param params
* @param handleSuccess
*/
export const batchDelete = (params, handleSuccess) => {
createConfirm({
iconType: 'warning',
title: '确认删除',
content: '是否删除选中数据',
okText: '确认',
cancelText: '取消',
onOk: () => {
return defHttp.delete({url: Api.deleteBatch, data: params}, {joinParamsToUrl: true}).then(() => {
handleSuccess();
});
}
});
}
/**
*
* @param params
* @param isUpdate
*/
export const saveOrUpdate = (params, isUpdate) => {
let url = isUpdate ? Api.edit : Api.save;
return defHttp.post({ url: url, params }, { isTransformResponse: false });
}

View File

@ -0,0 +1,50 @@
import {BasicColumn} from '/@/components/Table';
import {FormSchema} from '/@/components/Table';
import { rules} from '/@/utils/helper/validator';
import { render } from '/@/utils/common/renderUtils';
import { getWeekMonthQuarterYear } from '/@/utils';
//列表数据
export const columns: BasicColumn[] = [
{
title: '资源类型',
align: "center",
dataIndex: 'resourcesType_dictText'
},
{
title: '附件类型',
align: "center",
dataIndex: 'fileType_dictText'
},
{
title: '名称',
align: "center",
dataIndex: 'name'
},
{
title: '附件',
align: "center",
dataIndex: 'filePath',
customRender: render.renderImage,
},
{
title: '选中图片',
align: "center",
dataIndex: 'checkPicPath',
customRender: render.renderImage,
},
{
title: '备注',
align: "center",
dataIndex: 'content'
},
];
// 高级查询数据
export const superQuerySchema = {
resourcesType: {title: '资源类型',order: 0,view: 'list', type: 'string',dictCode: 'resources_type',},
fileType: {title: '附件类型',order: 1,view: 'list', type: 'string',dictCode: 'file_type',},
name: {title: '名称',order: 2,view: 'text', type: 'string',},
filePath: {title: '附件',order: 3,view: 'image', type: 'string',},
checkPicPath: {title: '选中图片',order: 4,view: 'image', type: 'string',},
content: {title: '备注',order: 5,view: 'textarea', type: 'string',},
};

View File

@ -0,0 +1,239 @@
<template>
<div class="p-2">
<!--查询区域-->
<div class="jeecg-basic-table-form-container">
<a-form ref="formRef" @keyup.enter.native="searchQuery" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol">
<a-row :gutter="24">
<a-col :lg="6">
<a-form-item name="resourcesType">
<template #label><span title="资源类型">资源类型</span></template>
<j-select-multiple placeholder="请选择资源类型" v-model:value="queryParam.resourcesType" dictCode="resources_type" allow-clear />
</a-form-item>
</a-col>
<a-col :lg="6">
<a-form-item name="fileType">
<template #label><span title="附件类型">附件类型</span></template>
<j-select-multiple placeholder="请选择附件类型" v-model:value="queryParam.fileType" dictCode="file_type" allow-clear />
</a-form-item>
</a-col>
<a-col :lg="6">
<a-form-item name="name">
<template #label><span title="名称">名称</span></template>
<a-input placeholder="请输入名称" v-model:value="queryParam.name" allow-clear ></a-input>
</a-form-item>
</a-col>
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<span style="float: left; overflow: hidden" class="table-page-search-submitButtons">
<a-col :lg="6">
<a-button type="primary" preIcon="ant-design:search-outlined" @click="searchQuery">查询</a-button>
<a-button type="primary" preIcon="ant-design:reload-outlined" @click="searchReset" style="margin-left: 8px">重置</a-button>
</a-col>
</span>
</a-col>
</a-row>
</a-form>
</div>
<!--引用表格-->
<BasicTable @register="registerTable">
<!--插槽:table标题-->
<template #tableTitle>
<a-button type="primary" v-auth="'resourcesManagement:nu_resources_management:add'" @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增</a-button>
</template>
<!--操作栏-->
<template #action="{ record }">
<TableAction :actions="getTableAction(record)" />
</template>
<template v-slot:bodyCell="{ column, record, index, text }">
</template>
</BasicTable>
<!-- 表单区域 -->
<NuResourcesManagementModal ref="registerModal" @success="handleSuccess"></NuResourcesManagementModal>
</div>
</template>
<script lang="ts" name="resourcesManagement-nuResourcesManagement" setup>
import { ref, reactive } from 'vue';
import { BasicTable, useTable, TableAction } from '/@/components/Table';
import { useListPage } from '/@/hooks/system/useListPage';
import { columns, superQuerySchema } from './NuResourcesManagement.data';
import { list, deleteOne, batchDelete, getImportUrl, getExportUrl } from './NuResourcesManagement.api';
import { downloadFile } from '/@/utils/common/renderUtils';
import NuResourcesManagementModal from './components/NuResourcesManagementModal.vue'
import { useUserStore } from '/@/store/modules/user';
import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue';
import JSelectMultiple from '/@/components/Form/src/jeecg/components/JSelectMultiple.vue';
const formRef = ref();
const queryParam = reactive<any>({});
const toggleSearchStatus = ref<boolean>(false);
const registerModal = ref();
const userStore = useUserStore();
//table
const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({
tableProps: {
title: '资源管理',
api: list,
columns,
canResize:false,
useSearchForm: false,
actionColumn: {
width: 140,
fixed: 'right',
},
beforeFetch: async (params) => {
return Object.assign(params, queryParam);
},
},
exportConfig: {
name: "资源管理",
url: getExportUrl,
params: queryParam,
},
importConfig: {
url: getImportUrl,
success: handleSuccess
},
});
const [registerTable, { reload, collapseAll, updateTableDataRecord, findTableDataRecord, getDataSource }, { rowSelection, selectedRowKeys }] = tableContext;
const labelCol = reactive({
xs:24,
sm:4,
xl:6,
xxl:4
});
const wrapperCol = reactive({
xs: 24,
sm: 20,
});
//
const superQueryConfig = reactive(superQuerySchema);
/**
* 高级查询事件
*/
function handleSuperQuery(params) {
Object.keys(params).map((k) => {
queryParam[k] = params[k];
});
searchQuery();
}
/**
* 新增事件
*/
function handleAdd() {
registerModal.value.disableSubmit = false;
registerModal.value.add();
}
/**
* 编辑事件
*/
function handleEdit(record: Recordable) {
registerModal.value.disableSubmit = false;
registerModal.value.edit(record);
}
/**
* 详情
*/
function handleDetail(record: Recordable) {
registerModal.value.disableSubmit = true;
registerModal.value.edit(record);
}
/**
* 删除事件
*/
async function handleDelete(record) {
await deleteOne({ id: record.id }, handleSuccess);
}
/**
* 批量删除事件
*/
async function batchHandleDelete() {
await batchDelete({ ids: selectedRowKeys.value }, handleSuccess);
}
/**
* 成功回调
*/
function handleSuccess() {
(selectedRowKeys.value = []) && reload();
}
/**
* 操作栏
*/
function getTableAction(record) {
return [
{
label: '详情',
onClick: handleDetail.bind(null, record),
},
{
label: '编辑',
onClick: handleEdit.bind(null, record),
auth: 'resourcesManagement:nu_resources_management:edit'
}, {
label: '删除',
popConfirm: {
title: '是否确认删除',
confirm: handleDelete.bind(null, record),
placement: 'topLeft',
},
auth: 'resourcesManagement:nu_resources_management:delete'
}
];
}
/**
* 查询
*/
function searchQuery() {
reload();
}
/**
* 重置
*/
function searchReset() {
formRef.value.resetFields();
selectedRowKeys.value = [];
//
reload();
}
</script>
<style lang="less" scoped>
.jeecg-basic-table-form-container {
padding: 0;
.table-page-search-submitButtons {
display: block;
margin-bottom: 24px;
white-space: nowrap;
}
.query-group-cust{
min-width: 100px !important;
}
.query-group-split-cust{
width: 30px;
display: inline-block;
text-align: center
}
.ant-form-item:not(.ant-form-item-with-help){
margin-bottom: 16px;
height: 32px;
}
:deep(.ant-picker),:deep(.ant-input-number){
width: 100%;
}
}
</style>

View File

@ -0,0 +1,197 @@
<template>
<a-spin :spinning="confirmLoading">
<JFormContainer :disabled="disabled">
<template #detail>
<a-form ref="formRef" class="antd-modal-form" :labelCol="labelCol" :wrapperCol="wrapperCol" name="NuResourcesManagementForm">
<a-row>
<a-col :span="24">
<a-form-item label="资源类型" v-bind="validateInfos.resourcesType" id="NuResourcesManagementForm-resourcesType" name="resourcesType">
<j-dict-select-tag v-model:value="formData.resourcesType" dictCode="resources_type" placeholder="请选择类型" allow-clear />
</a-form-item>
</a-col>
<a-col :span="24">
<a-form-item label="附件类型" v-bind="validateInfos.fileType" id="NuResourcesManagementForm-fileType" name="fileType">
<j-dict-select-tag v-model:value="formData.fileType" dictCode="file_type" placeholder="请选择附件类型" allow-clear />
</a-form-item>
</a-col>
<a-col :span="24">
<a-form-item label="名称" v-bind="validateInfos.name" id="NuResourcesManagementForm-name" name="name">
<a-input v-model:value="formData.name" maxlength="20" show-count placeholder="请输入名称" ></a-input>
</a-form-item>
</a-col>
<a-col :span="24" v-if="formData.fileType == 'image'">
<a-form-item label="附件" v-bind="validateInfos.filePath" id="NuResourcesManagementForm-filePath" name="filePath">
<j-image-upload :fileMax="1" v-model:value="formData.filePath" ></j-image-upload>
</a-form-item>
</a-col>
<a-col :span="24" v-if="formData.fileType == 'image'">
<a-form-item label="选中图片" v-bind="validateInfos.checkPicPath" id="NuResourcesManagementForm-checkPicPath" name="checkPicPath">
<j-image-upload :fileMax="1" v-model:value="formData.checkPicPath" ></j-image-upload>
</a-form-item>
</a-col>
<a-col :span="24" v-if="formData.fileType == 'video'">
<a-form-item label="视频" v-bind="validateInfos.filePath" id="NuResourcesManagementForm-filePath" name="filePath">
<j-upload :fileMax="1" v-model:value="formData.filePath" ></j-upload>
</a-form-item>
</a-col>
<a-col :span="24" v-if="formData.fileType == 'audio'">
<a-form-item label="音频" v-bind="validateInfos.filePath" id="NuResourcesManagementForm-filePath" name="filePath">
<j-upload :fileMax="1" v-model:value="formData.filePath" ></j-upload>
</a-form-item>
</a-col>
<a-col :span="24" v-if="formData.fileType == 'document'">
<a-form-item label="文档" v-bind="validateInfos.filePath" id="NuResourcesManagementForm-filePath" name="filePath">
<j-upload :fileMax="1" v-model:value="formData.filePath" ></j-upload>
</a-form-item>
</a-col>
<a-col :span="24">
<a-form-item label="备注" v-bind="validateInfos.content" id="NuResourcesManagementForm-content" name="content">
<a-textarea v-model:value="formData.content" maxlength="50" show-count :rows="4" placeholder="请输入备注" />
</a-form-item>
</a-col>
</a-row>
</a-form>
</template>
</JFormContainer>
</a-spin>
</template>
<script lang="ts" setup>
import { ref, reactive, defineExpose, nextTick, defineProps, computed, onMounted } from 'vue';
import { defHttp } from '/@/utils/http/axios';
import { useMessage } from '/@/hooks/web/useMessage';
import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue';
import JImageUpload from '/@/components/Form/src/jeecg/components/JImageUpload.vue';
import JUpload from '/@/components/Form/src/jeecg/components/JUpload/JUpload.vue';
import { getValueType } from '/@/utils';
import { saveOrUpdate } from '../NuResourcesManagement.api';
import { Form } from 'ant-design-vue';
import JFormContainer from '/@/components/Form/src/container/JFormContainer.vue';
const props = defineProps({
formDisabled: { type: Boolean, default: false },
formData: { type: Object, default: () => ({})},
formBpm: { type: Boolean, default: true }
});
const formRef = ref();
const useForm = Form.useForm;
const emit = defineEmits(['register', 'ok']);
const formData = reactive<Record<string, any>>({
id: '',
resourcesType: '',
fileType: '',
name: '',
filePath: '',
checkPicPath: '',
content: '',
});
const { createMessage } = useMessage();
const labelCol = ref<any>({ xs: { span: 24 }, sm: { span: 5 } });
const wrapperCol = ref<any>({ xs: { span: 24 }, sm: { span: 16 } });
const confirmLoading = ref<boolean>(false);
//
const validatorRules = reactive({
resourcesType: [{ required: true, message: '请选择类型' }],
fileType: [{ required: true, message: '请选择附件类型' }],
name: [{ required: true, message: '请输入名称' }],
filePath: [{ required: true, message: '请上传附件' }],
});
const { resetFields, validate, validateInfos } = useForm(formData, validatorRules, { immediate: false });
//
const disabled = computed(()=>{
if(props.formBpm === true){
if(props.formData.disabled === false){
return false;
}else{
return true;
}
}
return props.formDisabled;
});
/**
* 新增
*/
function add() {
edit({});
}
/**
* 编辑
*/
function edit(record) {
nextTick(() => {
resetFields();
const tmpData = {};
Object.keys(formData).forEach((key) => {
if(record.hasOwnProperty(key)){
tmpData[key] = record[key]
}
})
//
Object.assign(formData, tmpData);
});
}
/**
* 提交数据
*/
async function submitForm() {
try {
//
await validate();
} catch ({ errorFields }) {
if (errorFields) {
const firstField = errorFields[0];
if (firstField) {
formRef.value.scrollToField(firstField.name, { behavior: 'smooth', block: 'center' });
}
}
return Promise.reject(errorFields);
}
confirmLoading.value = true;
const isUpdate = ref<boolean>(false);
//
let model = formData;
if (model.id) {
isUpdate.value = true;
}
//
for (let data in model) {
//
if (model[data] instanceof Array) {
let valueType = getValueType(formRef.value.getProps, data);
//
if (valueType === 'string') {
model[data] = model[data].join(',');
}
}
}
await saveOrUpdate(model, isUpdate.value)
.then((res) => {
if (res.success) {
createMessage.success(res.message);
emit('ok');
} else {
createMessage.warning(res.message);
}
})
.finally(() => {
confirmLoading.value = false;
});
}
defineExpose({
add,
edit,
submitForm,
});
</script>
<style lang="less" scoped>
.antd-modal-form {
padding: 14px;
}
</style>

View File

@ -0,0 +1,82 @@
<template>
<a-drawer :title="title" :width="width" v-model:visible="visible" :closable="true"
:footer-style="{ textAlign: 'right' }" @close="handleCancel">
<NuResourcesManagementForm ref="registerForm" @ok="submitCallback" :formDisabled="disableSubmit" :formBpm="false"></NuResourcesManagementForm>
<template #footer>
<a-button type="primary" style="margin-right: 8px" @click="handleCancel">关闭</a-button>
<a-button type="primary" @click="handleOk" v-if="!disableSubmit">确认</a-button>
</template>
</a-drawer>
</template>
<script lang="ts" setup>
import { ref, nextTick, defineExpose } from 'vue';
import NuResourcesManagementForm from './NuResourcesManagementForm.vue'
import JModal from '/@/components/Modal/src/JModal/JModal.vue';
const title = ref<string>('');
const width = ref<number>(800);
const visible = ref<boolean>(false);
const disableSubmit = ref<boolean>(false);
const registerForm = ref();
const emit = defineEmits(['register', 'success']);
/**
* 新增
*/
function add() {
title.value = '新增';
visible.value = true;
nextTick(() => {
registerForm.value.add();
});
}
/**
* 编辑
* @param record
*/
function edit(record) {
title.value = disableSubmit.value ? '详情' : '编辑';
visible.value = true;
nextTick(() => {
registerForm.value.edit(record);
});
}
/**
* 确定按钮点击事件
*/
function handleOk() {
registerForm.value.submitForm();
}
/**
* form保存回调事件
*/
function submitCallback() {
handleCancel();
emit('success');
}
/**
* 取消按钮回调事件
*/
function handleCancel() {
visible.value = false;
}
defineExpose({
add,
edit,
disableSubmit,
});
</script>
<style lang="less">
/**隐藏样式-modal确定按钮 */
.jee-hidden {
display: none !important;
}
</style>
<style lang="less" scoped></style>