Browse Source

chore: 架构相关调整

master
wangxiang 2 years ago
parent
commit
a0b961da7b
  1. 7
      .eslintrc.js
  2. 26
      src/views/workflow/extension/form/FormCategoryModal.vue
  3. 60
      src/views/workflow/extension/form/form.data.ts
  4. 65
      src/views/workflow/extension/form/index.vue
  5. 103
      src/views/workflow/extension/formJson/FormJsonModal.vue
  6. 3
      src/views/workflow/extension/formJson/index.vue

7
.eslintrc.js

@ -62,8 +62,8 @@ module.exports = defineConfig({
'vue/attribute-hyphenation': 'off', 'vue/attribute-hyphenation': 'off',
'vue/require-default-prop': 'off', 'vue/require-default-prop': 'off',
'vue/html-end-tags': 'error', 'vue/html-end-tags': 'error',
'vue/html-quotes': [ 'error', 'double', { 'avoidEscape': false } ], 'vue/html-quotes': ['error', 'double', {'avoidEscape': false}],
'vue/no-multi-spaces': ['error', { 'ignoreProperties': false }], 'vue/no-multi-spaces': ['error', {'ignoreProperties': false}],
'vue/html-closing-bracket-newline': ['error', { 'vue/html-closing-bracket-newline': ['error', {
'singleline': 'never', 'singleline': 'never',
'multiline': 'always' 'multiline': 'always'
@ -95,7 +95,7 @@ module.exports = defineConfig({
}], }],
'vue/this-in-template': ['error', 'never'], 'vue/this-in-template': ['error', 'never'],
'vue/component-tags-order': ['error', { 'vue/component-tags-order': ['error', {
'order': [ [ 'script', 'template' ], 'style' ] 'order': [['script', 'template'], 'style']
}], }],
'vue/attributes-order': ['error', { 'vue/attributes-order': ['error', {
'order': [ 'order': [
@ -115,5 +115,6 @@ module.exports = defineConfig({
}], }],
'vue/no-v-html': 'off', 'vue/no-v-html': 'off',
'vue/multi-word-component-names': 'off', 'vue/multi-word-component-names': 'off',
'vue/first-attribute-linebreak': 'off',
} }
}); });

26
src/views/workflow/extension/form/FormCategoryModal.vue

@ -18,9 +18,10 @@
*/ */
import { ref, unref } from 'vue'; import { ref, unref } from 'vue';
import { BasicForm, useForm } from '/@/components/Form/index'; import { BasicForm, useForm } from '/@/components/Form/index';
import { formSchema } from './form.data'; import { formCategorySchema } from './form.data';
import { addFormDefinition, editFormDefinition, getFormDefinition } from '/@/api/platform/workflow/extension/controller/formDefinition';
import { BasicModal, ModalProps, useModalInner } from '/@/components/Modal'; import { BasicModal, ModalProps, useModalInner } from '/@/components/Modal';
import { listFormCategory, getFormCategory, addFormCategory, editFormCategory } from '/@/api/platform/workflow/extension/controller/formCategory';
import { listToTree } from '/@/utils/helper/treeHelper';
/** 通用变量统一声明区域 */ /** 通用变量统一声明区域 */
const tag = ref<Nullable<string>>(''); const tag = ref<Nullable<string>>('');
@ -28,7 +29,7 @@ const tag = ref<Nullable<string>>('');
const emit = defineEmits(['success', 'register']); const emit = defineEmits(['success', 'register']);
const [registerForm, { resetFields, setFieldsValue, validate, clearValidate, updateSchema }] = useForm({ const [registerForm, { resetFields, setFieldsValue, validate, clearValidate, updateSchema }] = useForm({
labelWidth: 100, labelWidth: 100,
schemas: formSchema, schemas: formCategorySchema,
showActionButtonGroup: false, showActionButtonGroup: false,
baseColProps: { span: 24 } baseColProps: { span: 24 }
}); });
@ -38,16 +39,25 @@ const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data
await clearValidate(); await clearValidate();
// //
tag.value = data._tag; tag.value = data._tag;
const rootTree = { id: '0', name: '顶级分类', children: [] };
rootTree.children = listToTree(await listFormCategory());
await updateSchema({
field: 'parentId',
componentProps: {
treeData: [rootTree]
}
});
const id = data.record?.id; const id = data.record?.id;
const props: Partial<ModalProps> = { confirmLoading: false }; const props: Partial<ModalProps> = { confirmLoading: false };
// tag // tag
switch (unref(tag)) { switch (unref(tag)) {
case 'add': case 'add':
props.title = '新增流程表单'; props.title = '新增表单分类';
id && await setFieldsValue({ parentId: id });
break; break;
case 'edit': case 'edit':
props.title = '编辑流程表单'; props.title = '编辑表单分类';
await setFieldsValue(await getFormDefinition(id)); await setFieldsValue(await getFormCategory(id));
break; break;
} }
// : // :
@ -64,10 +74,10 @@ async function handleSubmit() {
// tag // tag
switch (unref(tag)) { switch (unref(tag)) {
case 'add': case 'add':
await addFormDefinition(formData); await addFormCategory(formData);
break; break;
case 'edit': case 'edit':
await editFormDefinition(formData); await editFormCategory(formData);
break; break;
} }
// //

60
src/views/workflow/extension/form/form.data.ts

@ -109,3 +109,63 @@ export const formSchema: FormSchema[] = [
required: true, required: true,
}, },
]; ];
export const formCategorySchema: FormSchema[] = [
{
field: 'id',
label: 'ID',
component: 'Input',
show: false
},
{
field: 'parentId',
label: '上级分类',
component: 'ApiTreeSelect',
componentProps: {
placeholder: '请选择分类',
fieldNames: {
label: 'name',
key: 'id',
value: 'id'
},
getPopupContainer: () => document.body,
},
required: true,
},
{
field: 'name',
label: '名称',
component: 'Input',
componentProps: {
placeholder: '请输入名称',
},
required: true,
colProps: {
span: 12
}
},
{
field: 'sort',
label: '排序',
component: 'InputNumber',
componentProps: {
style: { width:'100%' },
min: 0
},
required: true,
colProps: {
span: 12
}
},
{
label: '备注',
field: 'remarks',
component: 'InputTextArea',
componentProps: {
rows: 6
},
colProps: {
span: 24
}
}
];

65
src/views/workflow/extension/form/index.vue

@ -17,7 +17,7 @@
type="primary" type="primary"
shape="circle" shape="circle"
size="small" size="small"
@click="handleAdd()" @click="handleFormCategoryAdd()"
> >
<PlusOutlined/> <PlusOutlined/>
</a-button> </a-button>
@ -28,19 +28,19 @@
<span> <span>
<a-button type="link" <a-button type="link"
size="small" size="small"
@click="handleAdd(data)" @click="handleFormCategoryAdd(data)"
> >
<PlusOutlined/> <PlusOutlined/>
</a-button> </a-button>
<a-button type="link" <a-button type="link"
size="small" size="small"
@click="handleAdd(data)" @click="handleFormCategoryEdit(data)"
> >
<FormOutlined/> <FormOutlined/>
</a-button> </a-button>
<a-button type="link" <a-button type="link"
size="small" size="small"
@click="handleAdd(data)" @click="handleFormCategoryDel(data)"
> >
<DeleteOutlined/> <DeleteOutlined/>
</a-button> </a-button>
@ -82,13 +82,13 @@
label: '修改', label: '修改',
icon: 'fa-solid:mortar-pestle', icon: 'fa-solid:mortar-pestle',
color: 'error', color: 'error',
onClick: handleDel.bind(null, record) onClick: handleEdit.bind(null, record)
}]" }]"
:dropDownActions="[ :dropDownActions="[
{ {
label: '版本管理', label: '版本管理',
icon: 'fa-solid:mortar-pestle', icon: 'fa-solid:mortar-pestle',
onClick: handleDel.bind(null, record), onClick: handleWorkFlowVersion.bind(null, record),
}, },
{ {
label: '删除', label: '删除',
@ -101,6 +101,7 @@
</template> </template>
</BasicTable> </BasicTable>
<FormModal @register="registerModal" @success="handleRefreshTable"/> <FormModal @register="registerModal" @success="handleRefreshTable"/>
<FormCategoryModal @register="registerFormCategoryModal" @success="handleRefreshTree"/>
<WorkflowFormDesign @register="registerWorkflowFormModal" @success="handleRefreshTable"/> <WorkflowFormDesign @register="registerWorkflowFormModal" @success="handleRefreshTable"/>
</PageWrapper> </PageWrapper>
</template> </template>
@ -113,11 +114,12 @@
import { BasicTree, TreeItem } from '/@/components/Tree'; import { BasicTree, TreeItem } from '/@/components/Tree';
import { useModal } from '/@/components/Modal'; import { useModal } from '/@/components/Modal';
import FormModal from './FormModal.vue'; import FormModal from './FormModal.vue';
import FormCategoryModal from './FormCategoryModal.vue';
import WorkflowFormDesign from './helper/WorkflowFormDesign.vue'; import WorkflowFormDesign from './helper/WorkflowFormDesign.vue';
import { columns, searchFormSchema } from './form.data'; import { columns, searchFormSchema } from './form.data';
import { useMessage } from '/@/hooks/web/useMessage'; import { useMessage } from '/@/hooks/web/useMessage';
import { listToTree } from '/@/utils/helper/treeHelper'; import { listToTree } from '/@/utils/helper/treeHelper';
import { listFormCategory } from '/@/api/platform/workflow/extension/controller/formCategory'; import { listFormCategory, delFormCategory } from '/@/api/platform/workflow/extension/controller/formCategory';
import { PlusOutlined, FormOutlined, DeleteOutlined } from '@ant-design/icons-vue'; import { PlusOutlined, FormOutlined, DeleteOutlined } from '@ant-design/icons-vue';
/** 类型规范统一声明定义区域 */ /** 类型规范统一声明定义区域 */
@ -141,6 +143,7 @@
FormOutlined, FormOutlined,
DeleteOutlined, DeleteOutlined,
WorkflowFormDesign, WorkflowFormDesign,
FormCategoryModal
}, },
setup() { setup() {
@ -159,6 +162,7 @@
const { createConfirm, createMessage } = useMessage(); const { createConfirm, createMessage } = useMessage();
const [registerModal, { openModal }] = useModal(); const [registerModal, { openModal }] = useModal();
const [registerFormCategoryModal, { openModal: openFormCategoryModal }] = useModal();
const [registerWorkflowFormModal , { openModal: openWorkflowFormModal }] = useModal(); const [registerWorkflowFormModal , { openModal: openWorkflowFormModal }] = useModal();
const [registerTable, { reload, clearSelectedRowKeys, getForm }] = useTable({ const [registerTable, { reload, clearSelectedRowKeys, getForm }] = useTable({
title: '流程表单列表', title: '流程表单列表',
@ -202,8 +206,8 @@
} }
/** 新增按钮操作,行内新增与工具栏局域新增通用 */ /** 新增按钮操作,行内新增与工具栏局域新增通用 */
function handleAdd() { function handleAdd(record?: Recordable) {
openModal(true,{ _tag: 'add' }); openModal(true, { _tag: 'add', record });
} }
/** 编辑按钮操作,行内编辑 */ /** 编辑按钮操作,行内编辑 */
@ -227,18 +231,53 @@
}); });
} }
/** 处理添加表单分类 */
function handleFormCategoryAdd(record?: Recordable) {
openFormCategoryModal(true,{ _tag: 'add', record });
}
/** 处理编辑表单分类 */
function handleFormCategoryEdit(record?: Recordable) {
openFormCategoryModal(true, { _tag: 'edit', record });
}
/** 处理表单分类删除 */
async function handleFormCategoryDel(record?: Recordable) {
const id = record?.id;
createConfirm({
iconType: 'warning',
title: '警告',
content: `是否确认删除表单分类编号为${id}吗?`,
onOk: async () => {
await delFormCategory(id);
createMessage.success('删除成功!');
handleRefreshTable();
}
});
}
/** 处理表格刷新 */ /** 处理表格刷新 */
function handleRefreshTable() { function handleRefreshTable() {
clearSelectedRowKeys(); clearSelectedRowKeys();
reload(); reload();
} }
/** 处理树形列表刷新 */
async function handleRefreshTree() {
state.treeData = listToTree(await listFormCategory());
}
/** 处理工作流表单设计 */ /** 处理工作流表单设计 */
function handleWorkFlowFormDesign(row: Recordable) { function handleWorkFlowFormDesign(row: Recordable) {
const record = row.formDefinitionJson || {}; const record = row.formDefinitionJson || {};
openWorkflowFormModal(true, { _tag: 'edit', record }); openWorkflowFormModal(true, { _tag: 'edit', record });
} }
/** 处理打开工作流版本管理 */
function handleWorkFlowVersion() {
// todo
}
function handleSelect(selectedKeys: string[]) { function handleSelect(selectedKeys: string[]) {
getForm().setFieldsValue({ getForm().setFieldsValue({
categoryId: selectedKeys[0] categoryId: selectedKeys[0]
@ -256,7 +295,13 @@
handleSelectionChange, handleSelectionChange,
handleRefreshTable, handleRefreshTable,
handleSelect, handleSelect,
handleWorkFlowFormDesign handleWorkFlowFormDesign,
handleWorkFlowVersion,
registerFormCategoryModal,
handleRefreshTree,
handleFormCategoryAdd,
handleFormCategoryEdit,
handleFormCategoryDel
}; };
} }
}); });

103
src/views/workflow/extension/formJson/FormJsonModal.vue

@ -1,103 +0,0 @@
<template>
<BasicModal
v-bind="$attrs"
width="720px"
@register="registerModal"
@ok="handleSubmit"
>
<BasicForm @register="registerForm"/>
</BasicModal>
</template>
<script lang="ts" setup>
/**
* 提供模板规范代码参考,请尽量保证编写代码风格跟模板规范代码一致
* 采用vben-动态表格表单封装组件编写,采用 setup 写法
* Copyright © 2020-2022 <a href="http://www.entfrm.com/">entfrm</a> All rights reserved.
* author entfrm开发团队-王翔
*/
import { ref, unref } from 'vue';
import { BasicForm, useForm } from '/@/components/Form/index';
import { formSchema } from './formJson.data';
import { addClient, editClient, getClient, listClient } from '/@/api/platform/system/controller/client';
import { BasicModal, ModalProps, useModalInner } from '/@/components/Modal';
import { isEmpty } from '/@/utils/is';
/** 通用变量统一声明区域 */
const tag = ref<Nullable<string>>('');
/** https://v3.cn.vuejs.org/api/options-data.html#emits */
const emit = defineEmits(['success', 'register']);
const [registerForm, { resetFields, setFieldsValue, validate, clearValidate, updateSchema }] = useForm({
labelWidth: 100,
schemas: formSchema,
showActionButtonGroup: false,
baseColProps: { span: 24 }
});
const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data: BoxPayload = { _tag: '' }) => {
//
await resetFields();
await clearValidate();
//
tag.value = data._tag;
const clientId = data.record?.clientId;
const props: Partial<ModalProps> = { confirmLoading: false };
await updateSchema({
field: 'clientId',
componentProps: {
disabled: unref(tag) != 'add'
},
rules: [
{
required: true,
whitespace: true,
message: '请输入客户端编码'
},
{
validator: async (rule, value) => {
if (!isEmpty(value)) {
const result = await listClient({ clientId: value });
const list = result.data?.filter(item => item.clientId != clientId);
if(list?.length > 0) return Promise.reject('该客户端编码已存在');
}
return Promise.resolve();
},
validateTrigger: 'blur'
}]
});
// tag
switch (unref(tag)) {
case 'add':
props.title = '新增客户端';
break;
case 'edit':
props.title = '编辑客户端';
await setFieldsValue(await getClient(clientId));
break;
}
// :
setModalProps(props);
});
/** 处理弹出框提交 */
async function handleSubmit() {
try {
//
const formData = await validate();
//
setModalProps({ confirmLoading: true });
// tag
switch (unref(tag)) {
case 'add':
await addClient(formData);
break;
case 'edit':
await editClient(formData);
break;
}
//
closeModal();
emit('success');
} finally {
setModalProps({ confirmLoading: false });
}
}
</script>

3
src/views/workflow/extension/formJson/index.vue

@ -44,8 +44,6 @@
</template> </template>
</template> </template>
</BasicTable> </BasicTable>
<!--弹出窗体区域-->
<ClientModal @register="registerModal" @success="handleRefreshTable"/>
</div> </div>
</template> </template>
@ -60,7 +58,6 @@
import { BasicTable, useTable, TableAction } from '/@/components/Table'; import { BasicTable, useTable, TableAction } from '/@/components/Table';
import { listClient, delClient } from '/@/api/platform/system/controller/client'; import { listClient, delClient } from '/@/api/platform/system/controller/client';
import { useModal } from '/@/components/Modal'; import { useModal } from '/@/components/Modal';
import ClientModal from './ClientModal.vue';
import { columns, searchFormSchema } from './formJson.data'; import { columns, searchFormSchema } from './formJson.data';
import { useMessage } from '/@/hooks/web/useMessage'; import { useMessage } from '/@/hooks/web/useMessage';

Loading…
Cancel
Save