|
@@ -69,6 +69,7 @@
|
|
<HcTableForm v-if="item.isTableRender" :ref="(el) => setItemRefs(el, item)" :api="apis"
|
|
<HcTableForm v-if="item.isTableRender" :ref="(el) => setItemRefs(el, item)" :api="apis"
|
|
:classify="classifys" :datas="changeFormDatas(item?.pkeyId, 'collapse')"
|
|
:classify="classifys" :datas="changeFormDatas(item?.pkeyId, 'collapse')"
|
|
:kid="item?.pkeyId"
|
|
:kid="item?.pkeyId"
|
|
|
|
+ :nodeName="item.nodeName"
|
|
:tid="treeId"
|
|
:tid="treeId"
|
|
scroll @render="tableFormRender($event, item, index)"
|
|
scroll @render="tableFormRender($event, item, index)"
|
|
@rightTap="tableFormRightTap($event, index)"/>
|
|
@rightTap="tableFormRightTap($event, index)"/>
|
|
@@ -234,7 +235,8 @@
|
|
<HcDragNode :more-menu="dragNodeMoreMenu" @menuTap="dragNodeMoreMenuTap($event, item)">
|
|
<HcDragNode :more-menu="dragNodeMoreMenu" @menuTap="dragNodeMoreMenuTap($event, item)">
|
|
<HcTableForm :ref="(el) => setItemRefs(el, item)" :api="apis" :classify="item.classify"
|
|
<HcTableForm :ref="(el) => setItemRefs(el, item)" :api="apis" :classify="item.classify"
|
|
:datas="changeFormDatas(item?.pkeyId, 'window')" :height="item.height"
|
|
:datas="changeFormDatas(item?.pkeyId, 'window')" :height="item.height"
|
|
- :kid="item.pkeyId" :tid="item.treeId" :width="item.width"
|
|
|
|
|
|
+ :kid="item.pkeyId" :nodeName="item.title" :tid="item.treeId"
|
|
|
|
+ :width="item.width"
|
|
@render="tableFormRender($event, item['item'], item['index'])"
|
|
@render="tableFormRender($event, item['item'], item['index'])"
|
|
@rightTap="tableFormRightTap($event, item['index'])"/>
|
|
@rightTap="tableFormRightTap($event, item['index'])"/>
|
|
</HcDragNode>
|
|
</HcDragNode>
|
|
@@ -1000,7 +1002,8 @@ const tableFormSaveClick = async (item, dragItem = null) => {
|
|
const saveExcelBussData = async ({pkeyId}, dragItem = null, showTip = true) => {
|
|
const saveExcelBussData = async ({pkeyId}, dragItem = null, showTip = true) => {
|
|
setDragModalLoading(dragItem, '保存中...', true)
|
|
setDragModalLoading(dragItem, '保存中...', true)
|
|
const refs = await getFormRef(pkeyId)
|
|
const refs = await getFormRef(pkeyId)
|
|
- const isRegExp = refs?.isFormRegExp()
|
|
|
|
|
|
+ const isRegExp = await refs?.isFormRegExp()
|
|
|
|
+ console.log(isRegExp)
|
|
if (isRegExp) {
|
|
if (isRegExp) {
|
|
const formData = refs?.getFormData()
|
|
const formData = refs?.getFormData()
|
|
const {error, code} = await wbsApi.saveExcelBussData(formData)
|
|
const {error, code} = await wbsApi.saveExcelBussData(formData)
|
|
@@ -1157,14 +1160,21 @@ const getFormData = async () => {
|
|
//获取表单效验数据
|
|
//获取表单效验数据
|
|
const getFormRegExpJson = async () => {
|
|
const getFormRegExpJson = async () => {
|
|
const formArr = await getFilterFormData();
|
|
const formArr = await getFilterFormData();
|
|
|
|
+ const list = listDatas.value
|
|
//获取表单数据
|
|
//获取表单数据
|
|
let formRegExpJson = {};
|
|
let formRegExpJson = {};
|
|
for (let i = 0; i < formArr.length; i++) {
|
|
for (let i = 0; i < formArr.length; i++) {
|
|
const pkeyId = formArr[i].pkeyId
|
|
const pkeyId = formArr[i].pkeyId
|
|
const refs = await getFormRef(pkeyId)
|
|
const refs = await getFormRef(pkeyId)
|
|
const regExp = refs?.getRegExpJson()
|
|
const regExp = refs?.getRegExpJson()
|
|
|
|
+ const nodeName = refs?.getNodeName()
|
|
if (getObjNullValue(regExp)) {
|
|
if (getObjNullValue(regExp)) {
|
|
- formRegExpJson[pkeyId] = regExp
|
|
|
|
|
|
+ const index = getIndex(list, 'pkeyId', pkeyId)
|
|
|
|
+ formRegExpJson[pkeyId] = {
|
|
|
|
+ ...regExp,
|
|
|
|
+ itemId: `item-${index}-${pkeyId}`,
|
|
|
|
+ nodeName: nodeName
|
|
|
|
+ }
|
|
}
|
|
}
|
|
}
|
|
}
|
|
return formRegExpJson
|
|
return formRegExpJson
|