Browse Source

chore: 兼容ant3

master
wangxiang 2 years ago
parent
commit
2bffff7869
  1. 1
      src/views/common/project/project.data.ts
  2. 2
      src/views/system/config/config.data.ts
  3. 40
      src/views/system/config/index.vue
  4. 1
      src/views/system/dept/dept.data.ts
  5. 1
      src/views/system/region/region.data.ts
  6. 18
      src/views/workflow/extension/form/form.data.ts
  7. 35
      src/views/workflow/extension/form/index.vue

1
src/views/common/project/project.data.ts

@ -100,7 +100,6 @@ export const formSchema: FormSchema[] = [
key: 'id', key: 'id',
value: 'id', value: 'id',
}, },
getPopupContainer: () => document.body,
} }
}, },
{ {

2
src/views/system/config/config.data.ts

@ -53,7 +53,7 @@ export const columns: ColumnProps<any>[] = [
title: '操作', title: '操作',
align: 'center', align: 'center',
dataIndex: 'action', dataIndex: 'action',
slots: { customRender: 'action' }, //slots: { customRender: 'action' },
fixed: false fixed: false
} }
]; ];

40
src/views/system/config/index.vue

@ -144,25 +144,27 @@
</div> </div>
</div> </div>
</template> </template>
<template #action="{ record }"> <template #bodyCell="{ column, record }">
<div :class="[`${prefixCls}__action`, 'center']"> <template v-if="column.dataIndex === 'action'">
<a-button <div :class="[`${prefixCls}__action`, 'center']">
v-auth="['config_edit']" <a-button
type="link" v-auth="['config_edit']"
size="small" type="link"
@click="handleEdit(record)" size="small"
><Icon icon="fa6-regular:pen-to-square" :size="14"/>修改 @click="handleEdit(record)"
</a-button> ><Icon icon="fa6-regular:pen-to-square" :size="14"/>修改
<ADivider type="vertical" class="action-divider"/> </a-button>
<a-button <ADivider type="vertical" class="action-divider"/>
v-auth="['config_del']" <a-button
type="link" v-auth="['config_del']"
size="small" type="link"
color="error" size="small"
@click="handleDel(record)" color="error"
><Icon icon="ant-design:delete-outlined" :size="15"/>删除 @click="handleDel(record)"
</a-button> ><Icon icon="ant-design:delete-outlined" :size="15"/>删除
</div> </a-button>
</div>
</template>
</template> </template>
</ATable> </ATable>
<!--弹出窗体区域--> <!--弹出窗体区域-->

1
src/views/system/dept/dept.data.ts

@ -100,7 +100,6 @@ export const formSchema: FormSchema[] = [
key: 'deptId', key: 'deptId',
value: 'deptId', value: 'deptId',
}, },
getPopupContainer: () => document.body,
} }
}, },
{ {

1
src/views/system/region/region.data.ts

@ -76,7 +76,6 @@ export const regionFormSchema: FormSchema[] = [
key: 'id', key: 'id',
value: 'id' value: 'id'
}, },
getPopupContainer: () => document.body,
} }
}, },
{ {

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

@ -48,20 +48,10 @@ export const columns: BasicColumn[] = [
/** 搜索表单配置 */ /** 搜索表单配置 */
export const searchFormSchema: FormSchema[] = [ export const searchFormSchema: FormSchema[] = [
{ {
field: 'categoryId',
label: '表单分类', label: '表单分类',
component: 'ApiTreeSelect', field: 'categoryId',
componentProps: { slot: 'categoryId',
placeholder: '请选择分类', component: 'Input',
fieldNames: {
label: 'name',
key: 'id',
value: 'id'
},
getPopupContainer: () => document.body,
api: listFormCategory,
listToTree: true,
},
colProps: { span: 8 } colProps: { span: 8 }
}, },
{ {
@ -93,7 +83,6 @@ export const formSchema: FormSchema[] = [
key: 'id', key: 'id',
value: 'id' value: 'id'
}, },
getPopupContainer: () => document.body,
api: listFormCategory, api: listFormCategory,
listToTree: true, listToTree: true,
}, },
@ -128,7 +117,6 @@ export const formCategorySchema: FormSchema[] = [
key: 'id', key: 'id',
value: 'id' value: 'id'
}, },
getPopupContainer: () => document.body,
}, },
required: true, required: true,
}, },

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

@ -99,6 +99,19 @@
/> />
</template> </template>
</template> </template>
<template #form-categoryId>
<ApiTreeSelect
ref="formCategoryIdElRef"
placeholder="请选择表单分类"
:fieldNames="{
label: 'name',
key: 'id',
value: 'id'
}"
:api="listFormCategory"
:listToTree="true"
/>
</template>
</BasicTable> </BasicTable>
<FormModal @register="registerModal" @success="handleRefreshTable"/> <FormModal @register="registerModal" @success="handleRefreshTable"/>
<FormCategoryModal @register="registerFormCategoryModal" @success="handleRefreshTree"/> <FormCategoryModal @register="registerFormCategoryModal" @success="handleRefreshTree"/>
@ -107,7 +120,7 @@
</template> </template>
<script lang="ts"> <script lang="ts">
import { defineComponent, reactive, toRaw, onMounted } from 'vue'; import { defineComponent, reactive, toRaw, onMounted, ref } from 'vue';
import { BasicTable, useTable, TableAction } from '/@/components/Table'; import { BasicTable, useTable, TableAction } from '/@/components/Table';
import { listFormDefinition, delFormDefinition, } from '/@/api/platform/workflow/extension/controller/formDefinition'; import { listFormDefinition, delFormDefinition, } from '/@/api/platform/workflow/extension/controller/formDefinition';
import { PageWrapper } from '/@/components/Page'; import { PageWrapper } from '/@/components/Page';
@ -122,13 +135,13 @@
import { listFormCategory, delFormCategory } 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';
import { useRouter } from 'vue-router'; import { useRouter } from 'vue-router';
import ApiTreeSelect from '/@/components/Form/src/components/ApiTreeSelect.vue';
/** 类型规范统一声明定义区域 */ /** 类型规范统一声明定义区域 */
interface TableState { interface TableState {
ids: string[]; ids: string[];
single: boolean; single: boolean;
multiple: boolean; multiple: boolean;
searchInfo: Recordable;
treeData: TreeItem[]; treeData: TreeItem[];
} }
@ -144,7 +157,8 @@
FormOutlined, FormOutlined,
DeleteOutlined, DeleteOutlined,
WorkflowFormDesign, WorkflowFormDesign,
FormCategoryModal FormCategoryModal,
ApiTreeSelect
}, },
setup() { setup() {
@ -156,11 +170,10 @@
single: true, single: true,
// //
multiple: true, multiple: true,
//
searchInfo: {},
treeData: [] treeData: []
}); });
const { push } = useRouter(); const { push } = useRouter();
const formCategoryIdElRef = ref();
const { createConfirm, createMessage } = useMessage(); const { createConfirm, createMessage } = useMessage();
const [registerModal, { openModal }] = useModal(); const [registerModal, { openModal }] = useModal();
const [registerFormCategoryModal, { openModal: openFormCategoryModal }] = useModal(); const [registerFormCategoryModal, { openModal: openFormCategoryModal }] = useModal();
@ -184,7 +197,6 @@
bordered: true, bordered: true,
clickToRowSelect: false, clickToRowSelect: false,
showIndexColumn: false, showIndexColumn: false,
searchInfo: state.searchInfo,
actionColumn: { actionColumn: {
width: 220, width: 220,
title: '操作', title: '操作',
@ -266,12 +278,7 @@
/** 处理树形列表刷新 */ /** 处理树形列表刷新 */
async function handleRefreshTree() { async function handleRefreshTree() {
state.treeData = listToTree(await listFormCategory()); state.treeData = listToTree(await listFormCategory());
await getForm().updateSchema({ await getForm().resetFields();
field: 'categoryId',
componentProps: {
treeData: state.treeData
}
});
} }
/** 处理工作流表单设计 */ /** 处理工作流表单设计 */
@ -309,7 +316,9 @@
handleRefreshTree, handleRefreshTree,
handleFormCategoryAdd, handleFormCategoryAdd,
handleFormCategoryEdit, handleFormCategoryEdit,
handleFormCategoryDel handleFormCategoryDel,
listFormCategory,
formCategoryIdElRef
}; };
} }
}); });

Loading…
Cancel
Save