update 移除流程表单 formConfig 属性,表单配置信息都放一起便于使用。

This commit is contained in:
konbai 2023-07-19 23:51:04 +08:00
parent d74a60eefe
commit 6bb08cc757

View File

@ -68,7 +68,7 @@
<!-- 预览表单对话框 --> <!-- 预览表单对话框 -->
<el-dialog :title="render.title" v-model="render.visible" width="60%" append-to-body> <el-dialog :title="render.title" v-model="render.visible" width="60%" append-to-body>
<v-form-render :form-json="formJson" :form-data="formData" ref="vfRenderRef" /> <v-form-render :form-json="{}" :form-data="{}" ref="vfRenderRef" />
</el-dialog> </el-dialog>
<!-- 添加或修改流程表单对话框 --> <!-- 添加或修改流程表单对话框 -->
@ -159,10 +159,6 @@ const data = reactive<PageData<FormForm, FormQuery>>({
const { queryParams, form, rules } = toRefs<PageData<FormForm, FormQuery>>(data); const { queryParams, form, rules } = toRefs<PageData<FormForm, FormQuery>>(data);
const formJson = reactive({"widgetList": [], "formConfig":{}});
const formData = reactive({})
/** 查询岗位列表 */ /** 查询岗位列表 */
const getList = async () => { const getList = async () => {
loading.value = true; loading.value = true;
@ -211,10 +207,7 @@ const handleUpdate = (row?: FormVO) => {
const formId = row?.formId || ids.value[0]; const formId = row?.formId || ids.value[0];
const res = await getForm(formId); const res = await getForm(formId);
form.value = res.data; form.value = res.data;
vfDesignerRef.value.setFormJson({ vfDesignerRef.value.setFormJson(form.value.content);
"formConfig": JSON.parse(form.value.formConfig),
"widgetList": JSON.parse(form.value.content)
});
}) })
} }
/** 查看表单操作 */ /** 查看表单操作 */
@ -222,8 +215,7 @@ const handleDetail = (row: FormVO) => {
render.visible = true; render.visible = true;
render.title = '查看表单详情'; render.title = '查看表单详情';
nextTick(async () => { nextTick(async () => {
formJson.formConfig = eval("(" + row.formConfig + ")"); vfRenderRef.value.setFormJson(row.content || {formConfig: {}, widgetList: []});
formJson.widgetList = eval("(" + row.content + ")");
}); });
} }
@ -244,10 +236,8 @@ const handleExport = () => {
} }
const submitForm = () => { const submitForm = () => {
let formJson = vfDesignerRef.value.getFormJson(); const formJson = vfDesignerRef.value.getFormJson();
console.log("formJson => ", formJson) form.value.content = JSON.stringify(formJson);
form.value.formConfig = JSON.stringify(formJson.formConfig);
form.value.content = JSON.stringify(formJson.widgetList);
nextTick(async () => { nextTick(async () => {
form.value.formId ? await updateForm(form.value) : await addForm(form.value); form.value.formId ? await updateForm(form.value) : await addForm(form.value);
proxy?.$modal.msgSuccess("操作成功"); proxy?.$modal.msgSuccess("操作成功");