Merge branch 'master' of http://120.26.64.82:10880/BFFE/dz2.1

src/components/publicPageForm/index.vue

@@ -262,8 +262,9 @@ export default {
       if (datas?.length) {
         datas.map(item => {
           const nitem = {}
-          nitem[item.pagecode] = item.alias ? item.alias : item.pagecode
-          nitem['keyVal'] = item.pageconfigurationid
+          nitem['pagecode'] = item.pagecode;
+          nitem['alias'] = item.alias;
+          nitem['pageconfigurationid'] = item.pageconfigurationid
           maps.push(nitem)
         })
         this.tableForm.passparameters = JSON.stringify(maps)

src/views/tablePage/index.vue

@@ -453,15 +453,31 @@ export default {
     cellClickHandler (row, column, cell, event) {
       const { property } = column
       const ndata = _.cloneDeep(this.tableCols).filter(item => item.pagecode == property)
+      const params = {}
       if (ndata?.length) {
         const { defaultfilter, pageroute, passparameters } = ndata[0]
         if (!pageroute) return
         if (defaultfilter || passparameters) {
           if (passparameters) {
-            const nitem = this.formatPass(passparameters)
+            // const nitem = this.formatPass(passparameters)
+            // console.log(passparameters)
+            const passparametersArray = JSON.parse(passparameters)
+            passparametersArray.map(item =>{
+              if(row[item.pagecode]){
+                const alias = item.alias
+                const pagecode = item.pagecode
+                if(alias){
+                  params[alias] = row[item['pagecode']]
+                }
+                else{
+                  params[pagecode] = row[item['pagecode']]
+                }
+              }
+            })
+            console.log(params)
             this.$router.push({
               path: pageroute,
-              query: nitem
+              query: params
             })
             return
           }