diff --git a/src/components/DesignForm/app/index.vue b/src/components/DesignForm/app/index.vue index 1da068ee6..5063d182b 100644 --- a/src/components/DesignForm/app/index.vue +++ b/src/components/DesignForm/app/index.vue @@ -99,6 +99,7 @@ const designStore = useDesignFormStore() const route = useRoute() const router = useRouter() const tableDataList = ref([]) // 表格行数据 +const currentAsfTableDataList = ref([])//当前点击的关联表单数据 const openTaskDrawer = ref(false) //新增数据 const state = reactive({ @@ -305,7 +306,7 @@ const searchSend = reactive({ searchData:json2string(props.searchData) }) let asfDetails = [] -let asfQueryParams = [] +let asfQueryParams: any[] = [] /** @ 作者: 秦东 @ 时间: 2024-04-01 15:51:32 @@ -355,7 +356,7 @@ const getPageData = () => { }) - if(asfDetails.length>0){ + if(asfDetails.length>0&&data.data.list!=null){ //console.log(data.data.list) //拼装参数,asf值对象数组 asfQueryParams = [] @@ -366,6 +367,7 @@ const getPageData = () => { asfQueryParamsItem.field = asfDetails[j].field let asfToSelectIds = [] + console.log(data.data.list) for(let i = 0;i { }) } } + +const asfGetPageData = (asfFormId: any,asfToSelectMastersKey: any) => { + let searchData = [{"id":"id","label":"Id","field":"id","type":"bigint(20)","attribute":"","pattern":"bigint","fieldClass":"id","activeValue":"","inactiveValue":"","config":{"optionsType":0},"control":{"optionsValue3Formid":"","optionsValue3Field":""},"options":[],"isSearch":true,"value":asfToSelectMastersKey}] + //state.loading = true; + let sendData = { + formId:asfFormId, + page:1, + pagesize:1, + searchData:json2string(searchData) + } + //console.log("asf获取列表详细信息",sendData) + gainFormPageListCont(sendData) + .then((data)=>{ + + //console.log("获取列表详细信息----------------->",data) + //liwenxuan 关联表单数据获取 start + + let dataList = data + //console.log(dataList) + asfDetails = props.data.columns.filter((item: any) => { + return item.fieldClass=="associatedForms" + }) + + + if(asfDetails.length>0){ + //console.log(data.data.list) + //拼装参数,asf值对象数组 + let asfAsfQueryParams = [] + for(let j = 0;j< asfDetails.length;j++){ + let asfQueryParamsItem :any = {} + //console.log(asfDetails[j]) + asfQueryParamsItem.formId = asfDetails[j].control.formid + asfQueryParamsItem.field = asfDetails[j].field + + let asfToSelectIds = [] + for(let i = 0;i0){ + getAsfDataTitlesByIds(asfAsfQueryParams).then(({ data }) => { + //console.log(data) + for(let i = 0;i{ + /* state.loading = false; */ + + //显示关联表单本条详情 + tablePageClass.value = 4; + drawerWith.value = container.value?.clientWidth + asflookPageInfoIsShow.value = true; + + + }) + +} + //liwenxuan 关联表单数据获取 start function getAsfDataTitlesByIds(asfQueryParams: any[]) { return request({ @@ -432,6 +536,45 @@ function getAsfDataTitlesByIds(asfQueryParams: any[]) { }); } //liwenxuan 关联表单数据获取 end + +//liwenxuan 关联表单详情弹窗 start +function showAsfDetailDialog(item: any,scope: any,asfQueryParams: any){ + let val = scope.row + //asfShowDetailsFlag.value= true + /* console.log("item----------------->",item) + console.log("scope----------------->",scope) + console.log("asfQueryParams----------------->",asfQueryParams) + console.log("val----------------->",val) */ + let asfFormId = item.control.formid//关联表单在customer_form中的id + //alert("asfFormId:"+asfFormId) + let scopeColumnProperty = scope.column.property//exp:associatedForms1720570283525 + + let asfQueryParamsNAsfToSelectIdsNAsfMasterId = val.id + //alert(asfQueryParamsNAsfToSelectIdsNAsfMasterId) + let asfToSelectMastersKey = "" + for(let i = 0;i{ getPageData() }) @@ -497,7 +640,9 @@ const drawerWith = ref(); //编辑表单时抽屉宽度 */ const tablePageClass = ref(1) const lookPageInfoIsShow = ref(false) +const asflookPageInfoIsShow = ref(false) const pageInfoCont = ref() + const lookPageInfo = (val:any) => { tablePageClass.value = 4; pageInfoCont.value = val @@ -929,7 +1074,7 @@ const tabsView = (val:any,types:number) => { key="primary" type="primary" link - @click="console.log(item);console.log(scope)" + @click="showAsfDetailDialog(item,scope,asfQueryParams)" > {{scope.row[scope.column.property]}} @@ -1027,7 +1172,7 @@ const tabsView = (val:any,types:number) => { - + diff --git a/src/components/DesignForm/tableListPage/index.vue b/src/components/DesignForm/tableListPage/index.vue index a213f4664..68e71f5c4 100644 --- a/src/components/DesignForm/tableListPage/index.vue +++ b/src/components/DesignForm/tableListPage/index.vue @@ -89,6 +89,7 @@ const designStore = useDesignFormStore() const route = useRoute() const router = useRouter() const tableDataList = ref([]) // 表格行数据 +const currentAsfTableDataList = ref([])//当前点击的关联表单数据 const openTaskDrawer = ref(false) //新增数据 const state = reactive({ @@ -281,7 +282,7 @@ watch(()=>props.lookPageIsShow,(val:boolean)=>{ } }) let asfDetails = [] -let asfQueryParams = [] +let asfQueryParams: any[] = [] /** @ 作者: 秦东 @ 时间: 2024-04-01 15:51:32 @@ -310,7 +311,7 @@ const getPageData = () => { }) - if(asfDetails.length>0){ + if(asfDetails.length>0&&data.data.list!=null){ //console.log(data.data.list) //拼装参数,asf值对象数组 asfQueryParams = [] @@ -376,15 +377,16 @@ const getPageData = () => { } -const asfGetPageData = () => { +const asfGetPageData = (asfFormId: any,asfToSelectMastersKey: any) => { + let searchData = [{"id":"id","label":"Id","field":"id","type":"bigint(20)","attribute":"","pattern":"bigint","fieldClass":"id","activeValue":"","inactiveValue":"","config":{"optionsType":0},"control":{"optionsValue3Formid":"","optionsValue3Field":""},"options":[],"isSearch":true,"value":asfToSelectMastersKey}] //state.loading = true; let sendData = { - formId:props.formId, + formId:asfFormId, page:1, pagesize:1, - searchData:json2string(props.searchData) + searchData:json2string(searchData) } - console.log("获取列表详细信息",sendData) + //console.log("asf获取列表详细信息",sendData) gainFormPageListCont(sendData) .then((data)=>{ @@ -401,7 +403,7 @@ const asfGetPageData = () => { if(asfDetails.length>0){ //console.log(data.data.list) //拼装参数,asf值对象数组 - asfQueryParams = [] + let asfAsfQueryParams = [] for(let j = 0;j< asfDetails.length;j++){ let asfQueryParamsItem :any = {} //console.log(asfDetails[j]) @@ -417,17 +419,18 @@ const asfGetPageData = () => { asfToSelectIds.push(asfMasterAndAsfId) } asfQueryParamsItem.asfToSelectIds = asfToSelectIds - asfQueryParams.push(asfQueryParamsItem) + asfAsfQueryParams.push(asfQueryParamsItem) } let queryCount = 0 - for(let i = 0;i0){ - getAsfDataTitlesByIds(asfQueryParams).then(({ data }) => { + getAsfDataTitlesByIds(asfAsfQueryParams).then(({ data }) => { //console.log(data) for(let i = 0;i { } } - tableDataList.value = dataList.data.list - + currentAsfTableDataList.value = dataList.data.list + }); }else{ - tableDataList.value = data.data.list + currentAsfTableDataList.value = data.data.list + + } }else{ - tableDataList.value = data.data.list + currentAsfTableDataList.value = data.data.list + + } /* //liwenxuan 关联表单数据获取 end @@ -460,7 +467,15 @@ const asfGetPageData = () => { }) .finally(()=>{ /* state.loading = false; */ + + //显示关联表单本条详情 + tablePageClass.value = 4; + drawerWith.value = container.value?.clientWidth + asflookPageInfoIsShow.value = true; + + }) + } @@ -482,16 +497,36 @@ const asfShowDetailsFlag = ref(false) function showAsfDetailDialog(item: any,scope: any,asfQueryParams: any){ let val = scope.row //asfShowDetailsFlag.value= true - console.log("item----------------->",item) + /* console.log("item----------------->",item) console.log("scope----------------->",scope) console.log("asfQueryParams----------------->",asfQueryParams) - console.log("val----------------->",val) + console.log("val----------------->",val) */ + let asfFormId = item.control.formid//关联表单在customer_form中的id + //alert("asfFormId:"+asfFormId) + let scopeColumnProperty = scope.column.property//exp:associatedForms1720570283525 + + let asfQueryParamsNAsfToSelectIdsNAsfMasterId = val.id + //alert(asfQueryParamsNAsfToSelectIdsNAsfMasterId) + let asfToSelectMastersKey = "" + for(let i = 0;i() -const asfPageInfoCont = ref() const lookPageInfo = (val:any) => { tablePageClass.value = 4; pageInfoCont.value = val @@ -1031,7 +1065,7 @@ const editFormSendFlow = (val:any) => { - + diff --git a/src/types/components.d.ts b/src/types/components.d.ts deleted file mode 100644 index 07f9ea9fc..000000000 --- a/src/types/components.d.ts +++ /dev/null @@ -1,177 +0,0 @@ -/* eslint-disable */ -/* prettier-ignore */ -// @ts-nocheck -// Generated by unplugin-vue-components -// Read more: https://github.com/vuejs/core/pull/3399 -import '@vue/runtime-core' - -export {} - -declare module '@vue/runtime-core' { - export interface GlobalComponents { - AceDrawer: typeof import('./../components/DesignForm/aceDrawer.vue')['default'] - AddNode: typeof import('./../components/workflow/addNode.vue')['default'] - App: typeof import('./../components/DesignForm/app/index.vue')['default'] - AppMenuSvgPage: typeof import('./../components/IconSelect/appMenuSvgPage.vue')['default'] - ApproverDrawer: typeof import('./../components/workflow/drwer/approverDrawer.vue')['default'] - BianXian: typeof import('./../components/DesignForm/designLayout/bianXian.vue')['default'] - Breadcrumb: typeof import('./../components/Breadcrumb/index.vue')['default'] - CalendarItem: typeof import('./../components/DesignForm/app/calendar/calendar1/calendarItem.vue')['default'] - CalendarPage: typeof import('./../components/DesignForm/app/calendarPage.vue')['default'] - ChildTable: typeof import('./../components/DesignForm/public/form/childTable.vue')['default'] - ConditionDrawer: typeof import('./../components/workflow/drwer/conditionDrawer.vue')['default'] - CopyerDrawer: typeof import('./../components/workflow/drwer/copyerDrawer.vue')['default'] - DayPage: typeof import('./../components/DesignForm/app/calendar/calendar1/dayPage.vue')['default'] - DesignLayoutButPage: typeof import('./../components/DesignForm/designLayout/designLayoutButPage.vue')['default'] - DesignLayoutPage: typeof import('./../components/DesignForm/designLayout/designLayoutPage.vue')['default'] - DiyIconfont: typeof import('./../components/DesignForm/public/expand/diy-iconfont.vue')['default'] - DragControl: typeof import('./../components/DesignForm/dragControl.vue')['default'] - DragControlApp: typeof import('./../components/DesignForm/dragControlApp.vue')['default'] - DragControlNew: typeof import('./../components/DesignForm/dragControlNew.vue')['default'] - ElAffix: typeof import('element-plus/es')['ElAffix'] - ElAside: typeof import('element-plus/es')['ElAside'] - ElAvatar: typeof import('element-plus/es')['ElAvatar'] - ElBreadcrumb: typeof import('element-plus/es')['ElBreadcrumb'] - ElBreadcrumbItem: typeof import('element-plus/es')['ElBreadcrumbItem'] - ElButton: typeof import('element-plus/es')['ElButton'] - ElButtonGroup: typeof import('element-plus/es')['ElButtonGroup'] - ElCard: typeof import('element-plus/es')['ElCard'] - ElCarousel: typeof import('element-plus/es')['ElCarousel'] - ElCarouselItem: typeof import('element-plus/es')['ElCarouselItem'] - ElCheckbox: typeof import('element-plus/es')['ElCheckbox'] - ElCheckboxGroup: typeof import('element-plus/es')['ElCheckboxGroup'] - ElCol: typeof import('element-plus/es')['ElCol'] - ElCollapse: typeof import('element-plus/es')['ElCollapse'] - ElCollapseItem: typeof import('element-plus/es')['ElCollapseItem'] - ElColorPicker: typeof import('element-plus/es')['ElColorPicker'] - ElContainer: typeof import('element-plus/es')['ElContainer'] - ElDatePicker: typeof import('element-plus/es')['ElDatePicker'] - ElDescriptions: typeof import('element-plus/es')['ElDescriptions'] - ElDescriptionsItem: typeof import('element-plus/es')['ElDescriptionsItem'] - ElDialog: typeof import('element-plus/es')['ElDialog'] - ElDivider: typeof import('element-plus/es')['ElDivider'] - ElDrawer: typeof import('element-plus/es')['ElDrawer'] - ElDropdown: typeof import('element-plus/es')['ElDropdown'] - ElDropdownItem: typeof import('element-plus/es')['ElDropdownItem'] - ElDropdownMenu: typeof import('element-plus/es')['ElDropdownMenu'] - ElForm: typeof import('element-plus/es')['ElForm'] - ElFormItem: typeof import('element-plus/es')['ElFormItem'] - ElHeader: typeof import('element-plus/es')['ElHeader'] - ElIcon: typeof import('element-plus/es')['ElIcon'] - ElImage: typeof import('element-plus/es')['ElImage'] - ElImageViewer: typeof import('element-plus/es')['ElImageViewer'] - ElInput: typeof import('element-plus/es')['ElInput'] - ElInputNumber: typeof import('element-plus/es')['ElInputNumber'] - ElMain: typeof import('element-plus/es')['ElMain'] - ElMenu: typeof import('element-plus/es')['ElMenu'] - ElMenuItem: typeof import('element-plus/es')['ElMenuItem'] - ElOption: typeof import('element-plus/es')['ElOption'] - ElPagination: typeof import('element-plus/es')['ElPagination'] - ElPopconfirm: typeof import('element-plus/es')['ElPopconfirm'] - ElPopover: typeof import('element-plus/es')['ElPopover'] - ElRadio: typeof import('element-plus/es')['ElRadio'] - ElRadioButton: typeof import('element-plus/es')['ElRadioButton'] - ElRadioGroup: typeof import('element-plus/es')['ElRadioGroup'] - ElResult: typeof import('element-plus/es')['ElResult'] - ElRow: typeof import('element-plus/es')['ElRow'] - ElScrollbar: typeof import('element-plus/es')['ElScrollbar'] - ElSelect: typeof import('element-plus/es')['ElSelect'] - ElSlider: typeof import('element-plus/es')['ElSlider'] - ElSpace: typeof import('element-plus/es')['ElSpace'] - ElStep: typeof import('element-plus/es')['ElStep'] - ElSteps: typeof import('element-plus/es')['ElSteps'] - ElSubMenu: typeof import('element-plus/es')['ElSubMenu'] - ElSwitch: typeof import('element-plus/es')['ElSwitch'] - ElTable: typeof import('element-plus/es')['ElTable'] - ElTableColumn: typeof import('element-plus/es')['ElTableColumn'] - ElTabPane: typeof import('element-plus/es')['ElTabPane'] - ElTabs: typeof import('element-plus/es')['ElTabs'] - ElTag: typeof import('element-plus/es')['ElTag'] - ElText: typeof import('element-plus/es')['ElText'] - ElTimeline: typeof import('element-plus/es')['ElTimeline'] - ElTimelineItem: typeof import('element-plus/es')['ElTimelineItem'] - ElTimePicker: typeof import('element-plus/es')['ElTimePicker'] - ElTooltip: typeof import('element-plus/es')['ElTooltip'] - ElTree: typeof import('element-plus/es')['ElTree'] - ElTreeSelect: typeof import('element-plus/es')['ElTreeSelect'] - ElUpload: typeof import('element-plus/es')['ElUpload'] - EmployeesDialog: typeof import('./../components/workflow/dialog/employeesDialog.vue')['default'] - EmployeesRoleDialog: typeof import('./../components/workflow/dialog/employeesRoleDialog.vue')['default'] - ErrorDialog: typeof import('./../components/workflow/dialog/errorDialog.vue')['default'] - FlexBox: typeof import('./../components/DesignForm/public/form/flexBox.vue')['default'] - Flow: typeof import('./../components/DesignForm/public/form/components/flow.vue')['default'] - Form: typeof import('./../components/DesignForm/public/form/form.vue')['default'] - Form2: typeof import('./../components/DesignForm/public/form/form2.vue')['default'] - FormControlAttr: typeof import('./../components/DesignForm/formControlAttr.vue')['default'] - FormControlAttr_2024024: typeof import('./../components/DesignForm/formControlAttr_2024024.vue')['default'] - FormControlAttres: typeof import('./../components/DesignForm/formControlAttres.vue')['default'] - FormControlProperties: typeof import('./../components/DesignForm/formControlProperties.vue')['default'] - FormControlPropertiNew: typeof import('./../components/DesignForm/formControlPropertiNew.vue')['default'] - FormGroup: typeof import('./../components/DesignForm/public/form/formGroup.vue')['default'] - FormGroup1: typeof import('./../components/DesignForm/public/form/formGroup1.vue')['default'] - FormItem: typeof import('./../components/DesignForm/public/form/formItem.vue')['default'] - FormPage: typeof import('./../components/DesignForm/app/formPage.vue')['default'] - FormPageCont: typeof import('./../components/DesignForm/tableListPage/formPageCont.vue')['default'] - FormPageContApp: typeof import('./../components/DesignForm/tableListPage/formPageContApp.vue')['default'] - FormVersion: typeof import('./../components/DesignForm/formVersion.vue')['default'] - FormWord: typeof import('./../components/workflow/dialog/formWord.vue')['default'] - GithubCorner: typeof import('./../components/GithubCorner/index.vue')['default'] - Hamburger: typeof import('./../components/Hamburger/index.vue')['default'] - HeadTools: typeof import('./../components/DesignForm/public/headTools.vue')['default'] - HeadToolsApp: typeof import('./../components/DesignForm/public/headToolsApp.vue')['default'] - HeadToolsNew: typeof import('./../components/DesignForm/public/headToolsNew.vue')['default'] - IconSelect: typeof import('./../components/IconSelect/index.vue')['default'] - IEpCaretBottom: typeof import('~icons/ep/caret-bottom')['default'] - IEpClose: typeof import('~icons/ep/close')['default'] - IEpEdit: typeof import('~icons/ep/edit')['default'] - IEpMessageBox: typeof import('~icons/ep/message-box')['default'] - IEpRefresh: typeof import('~icons/ep/refresh')['default'] - IEpSearch: typeof import('~icons/ep/search')['default'] - IEpSetting: typeof import('~icons/ep/setting')['default'] - LangSelect: typeof import('./../components/LangSelect/index.vue')['default'] - LayoutPage: typeof import('./../components/DesignForm/layoutPage/index.vue')['default'] - List: typeof import('./../components/DesignForm/public/form/components/list.vue')['default'] - ListTreeSide: typeof import('./../components/DesignForm/public/form/components/listTreeSide.vue')['default'] - MathFormula: typeof import('./../components/DesignForm/math/mathFormula.vue')['default'] - Matrix: typeof import('./../components/workflow/dialog/matrix.vue')['default'] - MonthPage: typeof import('./../components/DesignForm/app/calendar/calendar1/monthPage.vue')['default'] - MultiUpload: typeof import('./../components/Upload/MultiUpload.vue')['default'] - NodeWrap: typeof import('./../components/workflow/nodeWrap.vue')['default'] - PageSize: typeof import('./../components/DesignForm/designLayout/pageSize.vue')['default'] - PageSizeSmail: typeof import('./../components/DesignForm/designLayout/pageSizeSmail.vue')['default'] - Pagination: typeof import('./../components/Pagination/index.vue')['default'] - PositionDialog: typeof import('./../components/workflow/dialog/positionDialog.vue')['default'] - PromoterDrawer: typeof import('./../components/workflow/drwer/promoterDrawer.vue')['default'] - QuillEditor: typeof import('./../components/DesignForm/public/quillEditor.vue')['default'] - RightPanel: typeof import('./../components/RightPanel/index.vue')['default'] - RoleDialog: typeof import('./../components/workflow/dialog/roleDialog.vue')['default'] - RouterLink: typeof import('vue-router')['RouterLink'] - RouterView: typeof import('vue-router')['RouterView'] - Screen: typeof import('./../components/DesignForm/public/form/components/screen.vue')['default'] - Select: typeof import('./../components/DesignForm/public/form/select.vue')['default'] - SelectBoxs: typeof import('./../components/workflow/selectBoxs.vue')['default'] - SelectResult: typeof import('./../components/workflow/selectResult.vue')['default'] - SingleUpload: typeof import('./../components/Upload/SingleUpload.vue')['default'] - SizeSelect: typeof import('./../components/SizeSelect/index.vue')['default'] - SvgIcon: typeof import('./../components/SvgIcon/index.vue')['default'] - SvgPage: typeof import('./../components/IconSelect/svgPage.vue')['default'] - TableListPage: typeof import('./../components/DesignForm/tableListPage/index.vue')['default'] - Template: typeof import('./../components/DesignForm/template.vue')['default'] - TextPage: typeof import('./../components/DesignForm/designLayout/textPage.vue')['default'] - TimeAxis: typeof import('./../components/DesignForm/app/timeAxis.vue')['default'] - Tinymce: typeof import('./../components/DesignForm/public/form/tinymce.vue')['default'] - Tinymce_1: typeof import('./../components/DesignForm/public/form/tinymce_1.vue')['default'] - Tooltip: typeof import('./../components/DesignForm/tooltip.vue')['default'] - UnitBackGround: typeof import('./../components/DesignForm/designLayout/unitBackGround.vue')['default'] - User: typeof import('./../components/DesignForm/public/expand/user.vue')['default'] - UserDialog: typeof import('./../components/DesignForm/public/expand/userDialog.vue')['default'] - VueFile: typeof import('./../components/DesignForm/vueFile.vue')['default'] - WangEditor: typeof import('./../components/WangEditor/index.vue')['default'] - WeekPage: typeof import('./../components/DesignForm/app/calendar/calendar1/weekPage.vue')['default'] - Yuanjao: typeof import('./../components/DesignForm/designLayout/yuanjao.vue')['default'] - } - export interface ComponentCustomProperties { - vInfiniteScroll: typeof import('element-plus/es')['ElInfiniteScroll'] - vLoading: typeof import('element-plus/es')['ElLoadingDirective'] - } -} diff --git a/src/views/sysworkflow/lowcodepage/appPage/appPageForm/openAppFormPage.vue b/src/views/sysworkflow/lowcodepage/appPage/appPageForm/openAppFormPage.vue index cd7f9bdac..c745c24e8 100644 --- a/src/views/sysworkflow/lowcodepage/appPage/appPageForm/openAppFormPage.vue +++ b/src/views/sysworkflow/lowcodepage/appPage/appPageForm/openAppFormPage.vue @@ -201,10 +201,10 @@ const gainAppFormPageInit = () =>{ if(stateData.searchData[j].id==stateData.tableData.columns[i].id){ - console.log(stateData.tableData.columns[i]) + //console.log(stateData.tableData.columns[i]) stateData.searchData[j].control = stateData.tableData.columns[i].control stateData.searchData[j].config = stateData.tableData.columns[i].config - console.log(stateData.searchData[j]) + //console.log(stateData.searchData[j]) } } } diff --git a/src/views/sysworkflow/lowcodepage/runApp/runAppForm.vue b/src/views/sysworkflow/lowcodepage/runApp/runAppForm.vue index 4b59e61d0..597472606 100644 --- a/src/views/sysworkflow/lowcodepage/runApp/runAppForm.vue +++ b/src/views/sysworkflow/lowcodepage/runApp/runAppForm.vue @@ -184,7 +184,7 @@ const initLoadData = () => { if(stateData.tableData.columns[i].config!=undefined && stateData.tableData.columns[i].control!=undefined){ - console.log(stateData.tableData.columns[i]) + //console.log(stateData.tableData.columns[i]) let paramx:string = ""+stateData.tableData.columns[i].control.optionsValue3Field /* 在这里请求后台获取字段 @@ -193,7 +193,7 @@ const initLoadData = () => { stateData.tableData.columns[i].options = data if(stateData.searchData.length>0){ for(let j = 0;j { if(stateData.searchData[j].id==stateData.tableData.columns[i].id){ - console.log(stateData.tableData.columns[i]) + //console.log(stateData.tableData.columns[i]) stateData.searchData[j].control = stateData.tableData.columns[i].control stateData.searchData[j].config = stateData.tableData.columns[i].config - console.log(stateData.searchData[j]) + //console.log(stateData.searchData[j]) } } }