Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into feature/bpm

This commit is contained in:
YunaiV 2025-03-01 17:45:26 +08:00
commit 8ef39c76d6
2 changed files with 26 additions and 7 deletions

View File

@ -50,11 +50,13 @@ import FcDesigner from '@form-create/designer'
import { encodeConf, encodeFields, setConfAndFields } from '@/utils/formCreate'
import { useTagsViewStore } from '@/store/modules/tagsView'
import { useFormCreateDesigner } from '@/components/FormCreate'
import { useRoute } from 'vue-router'
defineOptions({ name: 'BpmFormEditor' })
const { t } = useI18n() //
const message = useMessage() //
const route = useRoute() //
const { push, currentRoute } = useRouter() //
const { query } = useRoute() //
const { delView } = useTagsViewStore() //
@ -150,6 +152,14 @@ onMounted(async () => {
const data = await FormApi.getForm(id)
formData.value = data
setConfAndFields(designer, data.conf, data.fields)
if (route.query.type !== 'copy') {
return
}
//
const { id: foo, ...copied } = data
formData.value = copied
formData.value.name += '_copy'
})
</script>

View File

@ -59,7 +59,15 @@
v-hasPermi="['bpm:form:update']"
link
type="primary"
@click="openForm(scope.row.id)"
@click="openForm('copy', scope.row.id)"
>
复制
</el-button>
<el-button
v-hasPermi="['bpm:form:update']"
link
type="primary"
@click="openForm('update', scope.row.id)"
>
编辑
</el-button>
@ -139,16 +147,17 @@ const resetQuery = () => {
}
/** 添加/修改操作 */
const openForm = (id?: number) => {
const toRouter: { name: string; query?: { id: number } } = {
name: 'BpmFormEditor'
const openForm = (type: string, id?: number) => {
const toRouter: { name: string; query: { type: string; id?: number } } = {
name: 'BpmFormEditor',
query: {
type
}
}
console.log(typeof id)
// idevent
if (typeof id === 'number' || typeof id === 'string') {
toRouter.query = {
id
}
toRouter.query.id = id
}
push(toRouter)
}