diff --git a/src/views/demo/onlineform/formModule/FormModal.vue b/src/views/demo/onlineform/formModule/FormModal.vue index fd9d7788..cc207e56 100644 --- a/src/views/demo/onlineform/formModule/FormModal.vue +++ b/src/views/demo/onlineform/formModule/FormModal.vue @@ -153,7 +153,7 @@ const config = modalDesign_config.value.config; // 基本配置信息 - let formModuleEntity = {}; + let formModuleEntity: any = {}; formModuleEntity = formData; formModuleEntity.formCode = formData.formCode; formModuleEntity.formVerison = @@ -162,7 +162,7 @@ formModuleEntity.scheme = JSON.stringify(config); // 目录sysModule - let sysModule = {}; + let sysModule: any = {}; sysModule.id = ''; sysModule.cascadeId = ''; sysModule.name = formData.name; @@ -178,10 +178,11 @@ sysModule.elements = []; // 按钮sysModuleElement - let sysModuleElement = []; + let sysModuleElement: any = []; if (config.table.btns) { config.table.btns.forEach((t) => { - let temp = {}; + console.log(t); + let temp: any = {}; temp.id = ''; temp.domId = t.prop; temp.name = t.label; @@ -192,24 +193,25 @@ temp.remark = ''; temp.sort = t.sort; temp.moduleId = ''; + temp.status = true; sysModuleElement.push(temp); }); } // 列sysModuleColumn - let sysModuleColumn = []; + let sysModuleColumn: any = []; if (config.table.columns) { config.table.columns.forEach((t) => { - let temp = {}; + let temp: any = {}; temp.encode = t.prop; temp.fullName = t.label; sysModuleColumn.push(temp); }); } // 表单sysModuleForm - let sysModuleForm = []; + let sysModuleForm: any = []; if (config.table.querys) { config.table.querys.forEach((t) => { - let temp = {}; + let temp: any = {}; temp.encode = t.key; temp.fullName = t.label; sysModuleForm.push(temp); @@ -217,7 +219,7 @@ } // postData - let postData = {}; + let postData: any = {}; postData.formModuleEntity = formModuleEntity; postData.sysModule = sysModule; postData.sysModuleElement = sysModuleElement; diff --git a/src/views/demo/onlineform/formModule/config/btns.vue b/src/views/demo/onlineform/formModule/config/btns.vue index 1ebcd25a..a503f410 100644 --- a/src/views/demo/onlineform/formModule/config/btns.vue +++ b/src/views/demo/onlineform/formModule/config/btns.vue @@ -62,7 +62,7 @@ import { ref, inject, defineProps, PropType, watch, onMounted, unref, nextTick } from 'vue'; import { BasicTable, useTable } from '@/components/Table'; import { PageWrapper } from '@/components/Page'; - import { BasicTree } from '@/components/Tree'; + import { BasicTree, TreeActionType } from '@/components/Tree'; // import { IconPicker } from '/@/components/Icon'; import { btns } from './config.data'; import { getInfoList } from '@/api/sys/WFSchemeInfo'; @@ -80,7 +80,7 @@ }); // config - const config = inject('formConfig'); + const config: any = inject('formConfig'); const btnsData = ref(config.table.btns); // 展开全部 const btnsTreeRef = ref>(null); @@ -125,7 +125,7 @@ unref(btnsTreeRef)?.setCheckedKeys(props.btnsCheckedKeys); }); let res = await getInfoList({}); - let categoryList = []; + let categoryList: any = []; res.forEach((item: any) => { if (!categoryList.includes(item.category)) { categoryList.push(item.category); @@ -134,11 +134,10 @@ categoryList.forEach((item1) => { res.forEach((item2) => { if (item1 == item2.category) { - wflist.value.push({ label: item2.category + '-' + item2.name, value: item2.id }); + wflist.value.push({ label: item2.category + '-' + item2.name, value: item2.code }); } }); }); - console.log(wflist); } onMounted(() => { diff --git a/src/views/demo/onlineform/formModule/modalForm.vue b/src/views/demo/onlineform/formModule/modalForm.vue index 737bb855..6424425c 100644 --- a/src/views/demo/onlineform/formModule/modalForm.vue +++ b/src/views/demo/onlineform/formModule/modalForm.vue @@ -106,7 +106,7 @@ // 版本options const formVerisons = ref([]); // 上级options - const pmoduleIds = ref([]); + const pmoduleIds: any = ref([]); // 参数 const formData = ref({ @@ -186,7 +186,7 @@ } // 表单选择回传数据-版本 async function getSchemeRow(row) { - let formVerisons_temp = []; + let formVerisons_temp: any = []; formData.value.formCode = row.id; formData.value.formCodeName = row.name; // 表单选择回传数据变化后,版本变化 diff --git a/src/views/demo/onlineform/formdesign/FormModal.vue b/src/views/demo/onlineform/formdesign/FormModal.vue index 4b963308..9c95d7af 100644 --- a/src/views/demo/onlineform/formdesign/FormModal.vue +++ b/src/views/demo/onlineform/formdesign/FormModal.vue @@ -129,12 +129,12 @@ // 表结构配置 if (saveFormDatas.value.info.formType == 2 && !isStageClick.value) { if (isAddVisible.value) { - schems.db = { + schems.db.push({ name: 'table' + new Date().getTime(), type: 'main', tableName: 'table' + new Date().getTime(), description: '', - }; + }); } saveFormDatas.value.scheme.scheme = JSON.stringify(schems); openModal(true, { saveFormDatas: saveFormDatas.value }); diff --git a/src/views/demo/onlineform/formdesign/modal/AutomaticModal.vue b/src/views/demo/onlineform/formdesign/modal/AutomaticModal.vue index ae2af3a0..2437bf3c 100644 --- a/src/views/demo/onlineform/formdesign/modal/AutomaticModal.vue +++ b/src/views/demo/onlineform/formdesign/modal/AutomaticModal.vue @@ -121,8 +121,8 @@ data.saveFormDatas.scheme.scheme = JSON.stringify(data_json); } let scheme = JSON.parse(data.saveFormDatas.scheme.scheme); - tableInfo.value.tableName = scheme.db.tableName; - tableInfo.value.description = scheme.db.description; + tableInfo.value.tableName = scheme.db[0].tableName; + tableInfo.value.description = scheme.db[0].description; tableInfo.value.dbCode = data.saveFormDatas.info.DbCode; let schemas = scheme.formInfo.schemas; @@ -180,8 +180,8 @@ function getFromAndTable() { let schems = JSON.parse(saveFormDatas.scheme.scheme); // db - schems.db.tableName = tableInfo.value.tableName; - schems.db.description = tableInfo.value.description; + schems.db[0].tableName = tableInfo.value.tableName; + schems.db[0].description = tableInfo.value.description; // schemas let i = 0; schems.formInfo.schemas.forEach((item, index) => {