优化、改造部分代码：
1.登录时是否输入租户码默认是需要输入。
2.切换租户的部分逻辑抽取成独立工具类。
3.表单编辑模块整合部分代码，将两个tabpane抽出来成独立文件。
4.修正bug-表单的列表配置为空时编辑页面报错，现改成为空时赋值{}。
5.系统数据迁移复制功能：去掉一些无用的代码；改成多租户时才允许以租户模式导入。
This commit is contained in:
suguangxu
@ -2,97 +2,10 @@
|
||||
<PageWrapper dense contentFullHeight fixed-height contentClass="flex">
|
||||
<a-tabs v-model:activeKey="activeKey" class="custom-tab white">
|
||||
<a-tab-pane key="1" tab="零代码表单">
|
||||
<div style="display:flex;background-color:white">
|
||||
<div
|
||||
class="w-1/3 xl:w-1/4 overflow-hidden bg-white h-full"
|
||||
:style="{ 'border-right': '1px solid #e5e7eb' }"
|
||||
>
|
||||
<BasicTree
|
||||
:title="t('表单分类')"
|
||||
:clickRowToExpand="true"
|
||||
:treeData="treeData"
|
||||
:fieldNames="{ key: 'id', title: 'name' }"
|
||||
@select="handleSelect"
|
||||
/>
|
||||
</div>
|
||||
<BasicTable @register="registerTable" class="w-2/3 xl:w-3/4">
|
||||
<template #toolbar>
|
||||
<div class="toolbar-defined">
|
||||
<a-button type="primary" @click="handleCreate" v-auth="'form-design:add'">
|
||||
<template #icon><PlusOutlined /></template>
|
||||
{{ t('新增') }}
|
||||
</a-button>
|
||||
<a-button @click="handleDelete" v-auth="'form-design:batchDelete'">{{
|
||||
t('批量删除')
|
||||
}}</a-button>
|
||||
<a-button @click="previewForm" v-auth="'form-design:previewForm'">{{
|
||||
t('预览表单')
|
||||
}}</a-button>
|
||||
<a-button @click="queryHistory">{{ t('历史记录') }}</a-button>
|
||||
<a-button @click="handleCategory" v-auth="'form-design:classifyMGT'">{{
|
||||
t('分类管理')
|
||||
}}</a-button>
|
||||
<a-button @click="handleCodeGenerator" v-auth="'form-design:generatedCode'">{{
|
||||
t('生成代码')
|
||||
}}</a-button>
|
||||
</div>
|
||||
</template>
|
||||
<template #action="{ record }">
|
||||
<TableAction
|
||||
:actions="[
|
||||
{
|
||||
icon: 'clarity:note-edit-line',
|
||||
auth: 'form-design:edit',
|
||||
onClick: handleEdit.bind(null, record,1),
|
||||
},
|
||||
{
|
||||
icon: 'ant-design:delete-outlined',
|
||||
auth: 'form-design:delete',
|
||||
color: 'error',
|
||||
onClick: handleDelete.bind(null, record),
|
||||
},
|
||||
]"
|
||||
/>
|
||||
</template>
|
||||
</BasicTable>
|
||||
</div>
|
||||
<ZeroCodeTypeTabPane ref="zeroCodeTypeTabPaneRef" :dicId="dicId"/>
|
||||
</a-tab-pane>
|
||||
<a-tab-pane key="2" tab="生成器表单">
|
||||
<div style="display:flex;background-color:white">
|
||||
<div
|
||||
class="w-1/3 xl:w-1/4 overflow-hidden bg-white h-full"
|
||||
:style="{ 'border-right': '1px solid #e5e7eb' }"
|
||||
>
|
||||
<BasicTree
|
||||
:title="t('生成器类型')"
|
||||
:clickRowToExpand="true"
|
||||
:treeData="treeData02"
|
||||
:fieldNames="{ key: 'id', title: 'name' }"
|
||||
@select="handleSelect02"
|
||||
/>
|
||||
</div>
|
||||
<BasicTable @register="registerTable02" class="w-2/3 xl:w-3/4">
|
||||
<template #toolbar>
|
||||
<div class="toolbar-defined">
|
||||
<a-button @click="previewForm02" v-auth="'form-design:previewForm'">{{
|
||||
t('预览表单')
|
||||
}}</a-button>
|
||||
<a-button @click="queryHistory02">{{ t('历史记录') }}</a-button>
|
||||
</div>
|
||||
</template>
|
||||
<template #action="{ record }">
|
||||
<TableAction
|
||||
:actions="[
|
||||
{
|
||||
icon: 'clarity:note-edit-line',
|
||||
auth: 'form-design:edit',
|
||||
onClick: handleEdit.bind(null, record,0),
|
||||
}
|
||||
]"
|
||||
/>
|
||||
</template>
|
||||
</BasicTable>
|
||||
</div>
|
||||
<GeneratorTypeTabPane ref="generatorTypeTabPaneRef"/>
|
||||
</a-tab-pane>
|
||||
</a-tabs>
|
||||
|
||||
@ -126,13 +39,7 @@
|
||||
</PageWrapper>
|
||||
</template>
|
||||
<script lang="ts" setup>
|
||||
import { BasicTable, useTable, TableAction, FormSchema, BasicColumn } from '/@/components/Table';
|
||||
import {
|
||||
getFormTemplatePage,
|
||||
deleteFormTemplate,
|
||||
updateFormTemplateStatus,
|
||||
getFormTemplate,
|
||||
} from '/@/api/form/design';
|
||||
import { h, onMounted, ref, createVNode, reactive, computed,provide } from 'vue';
|
||||
import { PageWrapper } from '/@/components/Page';
|
||||
import { useMessage } from '/@/hooks/web/useMessage';
|
||||
import { useModal } from '/@/components/Modal';
|
||||
@ -144,147 +51,26 @@
|
||||
import CodeFirstModal from './components/components/CodeFirstModal.vue';
|
||||
import SimpleTemplateModal from './components/components/SimpleTemplateModal.vue';
|
||||
import CodeGeneratorModal from './components/CodeGeneratorModal.vue';
|
||||
import { h, onMounted, ref, createVNode, reactive, computed,provide } from 'vue';
|
||||
import { BasicTree, TreeItem } from '/@/components/Tree';
|
||||
import { getDicDetailList } from '/@/api/system/dic';
|
||||
import { FormTypeEnum } from '/@/enums/formtypeEnum';
|
||||
import { Switch, Modal } from 'ant-design-vue';
|
||||
import { PlusOutlined, ExclamationCircleOutlined } from '@ant-design/icons-vue';
|
||||
import { useI18n } from '/@/hooks/web/useI18n';
|
||||
import ZeroCodeTypeTabPane from './tabpanes/ZeroCodeTypeTabPane.vue';
|
||||
import GeneratorTypeTabPane from './tabpanes/GeneratorTypeTabPane.vue';
|
||||
|
||||
const { t } = useI18n();
|
||||
const treeData = ref<TreeItem[]>([]);
|
||||
const treeData02 = ref<TreeItem[]>([
|
||||
{ "id":'0',name:'数据优先模板'},
|
||||
{ "id":'1',name:'界面优先模板'},
|
||||
{ "id":'2',name:'简易模板'}
|
||||
]);
|
||||
const formType=ref('');
|
||||
const selectId = ref('');
|
||||
const selectedKeys = ref<string[]>([]);
|
||||
const selectedKeys02 = ref<string[]>([]);
|
||||
|
||||
const dicId = '1419276800524424444';
|
||||
const activeKey = ref('1');
|
||||
const zeroCodeTypeTabPaneRef=ref();
|
||||
const generatorTypeTabPaneRef=ref();
|
||||
const state = reactive({
|
||||
isShowDataFirst: true,
|
||||
isShowCodeFirst: true,
|
||||
isShowSimpleTemplate: true,
|
||||
isShowCodeGenerator: true,
|
||||
});
|
||||
const searchFormSchema: FormSchema[] = [
|
||||
{
|
||||
field: 'keyword',
|
||||
label: t('关键字'),
|
||||
component: 'Input',
|
||||
componentProps: {
|
||||
placeholder: t('请输入关键字'),
|
||||
},
|
||||
},
|
||||
];
|
||||
|
||||
const columns: BasicColumn[] = [
|
||||
{
|
||||
dataIndex: 'name',
|
||||
title: t('名称'),
|
||||
align: 'left',
|
||||
},
|
||||
|
||||
{
|
||||
dataIndex: 'categoryName',
|
||||
title: t('分类'),
|
||||
align: 'left',
|
||||
},
|
||||
|
||||
{
|
||||
dataIndex: 'enabledMark',
|
||||
title: t('状态'),
|
||||
width: 120,
|
||||
align: 'left',
|
||||
customRender: ({ record }) => {
|
||||
if (!Reflect.has(record, 'pendingStatus')) {
|
||||
record.pendingStatus = false;
|
||||
}
|
||||
return h(Switch, {
|
||||
checked: record.enabledMark === 1,
|
||||
checkedChildren: t('已启用'),
|
||||
unCheckedChildren: t('已禁用'),
|
||||
loading: record.pendingStatus,
|
||||
onChange(checked: boolean) {
|
||||
record.pendingStatus = true;
|
||||
const newStatus = checked ? 1 : 0;
|
||||
const { createMessage } = useMessage();
|
||||
updateFormTemplateStatus(record.id, newStatus)
|
||||
.then(() => {
|
||||
record.enabledMark = newStatus;
|
||||
createMessage.success(t('已成功修改状态'));
|
||||
})
|
||||
.catch(() => {
|
||||
createMessage.error(t('修改状态失败'));
|
||||
})
|
||||
.finally(() => {
|
||||
record.pendingStatus = false;
|
||||
});
|
||||
},
|
||||
});
|
||||
},
|
||||
},
|
||||
{
|
||||
dataIndex: 'createUserName',
|
||||
title: t('创建人'),
|
||||
align: 'left',
|
||||
},
|
||||
{
|
||||
dataIndex: 'createDate',
|
||||
title: t('创建时间'),
|
||||
align: 'left',
|
||||
},
|
||||
{
|
||||
dataIndex: 'remark',
|
||||
align: 'left',
|
||||
title: t('备注'),
|
||||
},
|
||||
];
|
||||
|
||||
const columns02: BasicColumn[] = [
|
||||
{
|
||||
dataIndex: 'name',
|
||||
title: t('名称'),
|
||||
align: 'left',
|
||||
},
|
||||
{
|
||||
dataIndex: 'formDesignType',
|
||||
title: t('模板类型'),
|
||||
width: 120,
|
||||
align: 'left',
|
||||
customRender: ({ record }) => {
|
||||
if(record.formDesignType==0){
|
||||
return "数据优先模板";
|
||||
}else if(record.formDesignType==1){
|
||||
return "界面优先模板";
|
||||
}else if(record.formDesignType==2){
|
||||
return "简易模板";
|
||||
}else{
|
||||
return '';
|
||||
}
|
||||
},
|
||||
},
|
||||
{
|
||||
dataIndex: 'createUserName',
|
||||
title: t('创建人'),
|
||||
align: 'left',
|
||||
},
|
||||
{
|
||||
dataIndex: 'createDate',
|
||||
title: t('创建时间'),
|
||||
align: 'left',
|
||||
},
|
||||
{
|
||||
dataIndex: 'remark',
|
||||
align: 'left',
|
||||
title: t('备注'),
|
||||
},
|
||||
];
|
||||
|
||||
|
||||
const { notification } = useMessage();
|
||||
const formType=ref();
|
||||
|
||||
const [registerDesignModal, { openModal: openDesignModal }] = useModal();
|
||||
const [registerHistoryModal, { openModal: openHistoryModal }] = useModal();
|
||||
@ -294,199 +80,26 @@
|
||||
const [registerCodeFirst, { openModal: openCodeFirstModal }] = useModal();
|
||||
const [registerSimpleTemplate, { openModal: openSimpleTemplateModal }] = useModal();
|
||||
const [registerCodeGenerator, { openModal: openCodeGeneratorModal }] = useModal();
|
||||
const formConfig = {
|
||||
rowProps: {
|
||||
gutter: 16,
|
||||
},
|
||||
schemas: searchFormSchema,
|
||||
fieldMapToTime: [],
|
||||
showResetButton: false,
|
||||
};
|
||||
const [registerTable, { reload, setSelectedRowKeys }] = useTable({
|
||||
api: getFormTemplatePage,
|
||||
rowKey: 'id',
|
||||
title: '表单列表',
|
||||
columns,
|
||||
formConfig,
|
||||
beforeFetch: (params) => {
|
||||
//发送请求默认新增 左边树结构所选id
|
||||
return { ...params, category: selectId.value, type: FormTypeEnum.CUSTOM_FORM };
|
||||
},
|
||||
useSearchForm: true,
|
||||
showTableSetting: true,
|
||||
striped: false,
|
||||
actionColumn: {
|
||||
width: 80,
|
||||
title: t('操作'),
|
||||
dataIndex: 'action',
|
||||
slots: { customRender: 'action' },
|
||||
},
|
||||
rowSelection: {
|
||||
onChange: onSelectChange,
|
||||
},
|
||||
customRow02,
|
||||
tableSetting: {
|
||||
size: false,
|
||||
setting: false,
|
||||
},
|
||||
});
|
||||
|
||||
const [registerTable02, { reload:reload02, setSelectedRowKeys:setSelectedRowKeys02}] = useTable({
|
||||
api: getFormTemplatePage,
|
||||
rowKey: 'id',
|
||||
title: '表单列表',
|
||||
columns:columns02,
|
||||
formConfig,
|
||||
beforeFetch: (params) => {
|
||||
//发送请求默认新增 左边树结构所选id
|
||||
return { ...params, category: selectId.value, type: FormTypeEnum.SYSTEM_FORM };
|
||||
},
|
||||
useSearchForm: true,
|
||||
showTableSetting: true,
|
||||
striped: false,
|
||||
actionColumn: {
|
||||
width: 80,
|
||||
title: t('操作'),
|
||||
dataIndex: 'action',
|
||||
slots: { customRender: 'action' },
|
||||
},
|
||||
rowSelection: {
|
||||
onChange: onSelectChange02,
|
||||
},
|
||||
customRow,
|
||||
tableSetting: {
|
||||
size: false,
|
||||
setting: false,
|
||||
},
|
||||
});
|
||||
|
||||
const formId = computed(() => {
|
||||
return selectedKeys.value && selectedKeys.value.length
|
||||
? selectedKeys.value[selectedKeys.value.length - 1]
|
||||
: '';
|
||||
});
|
||||
|
||||
const formId02 = computed(() => {
|
||||
return selectedKeys02.value && selectedKeys02.value.length
|
||||
? selectedKeys02.value[selectedKeys02.value.length - 1]
|
||||
: '';
|
||||
});
|
||||
|
||||
function onSelectChange(rowKeys: string[]) {
|
||||
selectedKeys.value = rowKeys;
|
||||
setSelectedRowKeys(selectedKeys.value);
|
||||
}
|
||||
|
||||
function onSelectChange02(rowKeys: string[]) {
|
||||
selectedKeys02.value = rowKeys;
|
||||
setSelectedRowKeys02(selectedKeys02.value);
|
||||
}
|
||||
provide('openDesignModal', openDesignModal);
|
||||
provide('openHistoryModal', openHistoryModal);
|
||||
provide('openCategoryModal', openCategoryModal);
|
||||
provide('openPreviewModal', openPreviewModal);
|
||||
provide('openDataFirstModal', openDataFirstModal);
|
||||
provide('openCodeFirstModal', openCodeFirstModal);
|
||||
provide('openSimpleTemplateModal', openSimpleTemplateModal);
|
||||
provide('openCodeGeneratorModal', openCodeGeneratorModal);
|
||||
|
||||
function customRow(record: Recordable) {
|
||||
return {
|
||||
onClick: () => {
|
||||
let selectedRowKeys = [...selectedKeys.value];
|
||||
if (selectedRowKeys.indexOf(record.id) >= 0) {
|
||||
let index = selectedRowKeys.indexOf(record.id);
|
||||
selectedRowKeys.splice(index, 1);
|
||||
} else {
|
||||
selectedRowKeys.push(record.id);
|
||||
}
|
||||
selectedKeys.value = selectedRowKeys;
|
||||
setSelectedRowKeys(selectedRowKeys);
|
||||
},
|
||||
};
|
||||
}
|
||||
|
||||
function customRow02(record: Recordable) {
|
||||
return {
|
||||
onClick: () => {
|
||||
let selectedRowKeys = [...selectedKeys02.value];
|
||||
if (selectedRowKeys.indexOf(record.id) >= 0) {
|
||||
let index = selectedRowKeys.indexOf(record.id);
|
||||
selectedRowKeys02.splice(index, 1);
|
||||
} else {
|
||||
selectedRowKeys02.push(record.id);
|
||||
}
|
||||
selectedKeys02.value = selectedRowKeys;
|
||||
setSelectedRowKeys02(selectedRowKeys);
|
||||
},
|
||||
};
|
||||
}
|
||||
|
||||
function handleCreate() {
|
||||
openDesignModal(true, {
|
||||
title: t('添加表单'),
|
||||
});
|
||||
}
|
||||
|
||||
function handleEdit(record: Recordable,fType:number) {
|
||||
formType.value=fType;
|
||||
switch (record.formDesignType) {
|
||||
case 0:
|
||||
openDataFirstModal(true, {
|
||||
id: record.id,
|
||||
isUpdate: true,
|
||||
});
|
||||
break;
|
||||
case 1:
|
||||
openCodeFirstModal(true, {
|
||||
id: record.id,
|
||||
isUpdate: true,
|
||||
});
|
||||
break;
|
||||
case 2:
|
||||
openSimpleTemplateModal(true, {
|
||||
id: record.id,
|
||||
isUpdate: true,
|
||||
});
|
||||
break;
|
||||
default:
|
||||
notification.error({
|
||||
message: t('提示'),
|
||||
description: '该表单缺少模板类型',
|
||||
});
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
function handleDelete(record: Recordable = {}) {
|
||||
const ids = record.id ? [record.id] : selectedKeys.value;
|
||||
if (!ids.length) {
|
||||
noticeInfo('删除');
|
||||
return;
|
||||
}
|
||||
Modal.confirm({
|
||||
title: t('提示'),
|
||||
icon: createVNode(ExclamationCircleOutlined),
|
||||
content: t('确定要删除所选项吗？'),
|
||||
onOk() {
|
||||
deleteFormTemplate(ids).then(() => {
|
||||
reload();
|
||||
notification.success({
|
||||
message: t('提示'),
|
||||
description: t('删除成功'),
|
||||
});
|
||||
});
|
||||
},
|
||||
onCancel() {},
|
||||
okText: t('确认'),
|
||||
cancelText: t('取消'),
|
||||
});
|
||||
}
|
||||
|
||||
provide<Ref<number>>('formType', formType);
|
||||
|
||||
function handleCodeGenerator() {
|
||||
if (!formId.value) {
|
||||
noticeInfo('生成');
|
||||
return;
|
||||
}
|
||||
openCodeGeneratorModal(true, { formId: formId.value });
|
||||
}
|
||||
provide<number>('formType', formType);
|
||||
provide('noticeInfo', noticeInfo);
|
||||
|
||||
function handleSuccess() {
|
||||
reload();
|
||||
if(activeKey.value=='1'){
|
||||
zeroCodeTypeTabPaneRef.value.reload();
|
||||
}else if(activeKey.value=='2'){
|
||||
generatorTypeTabPaneRef.value.reload();
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
function handleClose(modal) {
|
||||
@ -496,76 +109,13 @@
|
||||
}, 100);
|
||||
}
|
||||
|
||||
function handleSelect(selectIds) {
|
||||
selectId.value = selectIds[0];
|
||||
reload({ searchInfo: { category: selectIds[0] } });
|
||||
}
|
||||
|
||||
function handleSelect02(selectIds) {
|
||||
selectId.value = selectIds[0];
|
||||
reload02({ searchInfo: { category: selectIds[0] } });
|
||||
}
|
||||
|
||||
function handleCategory() {
|
||||
openCategoryModal(true, { title: t('表单分类管理') });
|
||||
}
|
||||
|
||||
async function fetch() {
|
||||
treeData.value = (await getDicDetailList({
|
||||
itemId: dicId,
|
||||
})) as unknown as TreeItem[];
|
||||
}
|
||||
|
||||
async function previewForm() {
|
||||
if (!formId.value) {
|
||||
noticeInfo('预览');
|
||||
return;
|
||||
}
|
||||
const templateJson = await getFormTemplate(formId.value);
|
||||
openPreviewModal(true, { title: t('预览'), formJson: templateJson.formJson });
|
||||
}
|
||||
|
||||
async function previewForm02() {
|
||||
if (!formId02.value) {
|
||||
noticeInfo('预览');
|
||||
return;
|
||||
}
|
||||
const templateJson = await getFormTemplate(formId02.value);
|
||||
openPreviewModal(true, { title: t('预览'), formJson: templateJson.formJson });
|
||||
}
|
||||
|
||||
async function queryHistory() {
|
||||
if (!formId.value) {
|
||||
notification.warning({
|
||||
message: t('提示'),
|
||||
description: t(`请先选中一行后再查看当前表单历史记录！`),
|
||||
});
|
||||
return;
|
||||
}
|
||||
openHistoryModal(true, { title: t('历史记录'), formId: formId.value });
|
||||
}
|
||||
|
||||
async function queryHistory02() {
|
||||
if (!formId02.value) {
|
||||
notification.warning({
|
||||
message: t('提示'),
|
||||
description: t(`请先选中一行后再查看当前表单历史记录！`),
|
||||
});
|
||||
return;
|
||||
}
|
||||
openHistoryModal(true, { title: t('历史记录'), formId: formId02.value });
|
||||
}
|
||||
|
||||
function noticeInfo(info: string) {
|
||||
notification.warning({
|
||||
message: t('提示'),
|
||||
description: t(`请先选择要{notice}的数据项`, { notice: info }),
|
||||
}); //提示消息
|
||||
notification.warning({
|
||||
message: t('提示'),
|
||||
description: t(`请先选择要{notice}的数据项`, { notice: info }),
|
||||
}); //提示消息
|
||||
}
|
||||
|
||||
onMounted(() => {
|
||||
fetch();
|
||||
});
|
||||
</script>
|
||||
<style lang="less" scoped>
|
||||
.toolbar-defined {
|
||||
@ -575,12 +125,12 @@
|
||||
}
|
||||
|
||||
:deep(.custom-tab.white){
|
||||
background-color:white!important;
|
||||
background-color:white!important;
|
||||
}
|
||||
:deep(.ant-tabs-nav){
|
||||
padding:0px 10px!important;
|
||||
padding:0px 10px!important;
|
||||
}
|
||||
|
||||
|
||||
// :deep(.ant-col-15) {
|
||||
// flex: 0 0 calc(100% - 185px);
|
||||
// max-width: initial;
|
||||
|
||||
Reference in New Issue
Block a user