three-trees-ui 1.0.13 → 1.0.15

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "three-trees-ui",
-  "version": "1.0.13",
+  "version": "1.0.15",
   "publicPath": "/ui",
   "author": "hotent",
   "private": false,

package/packages/CustomDialog/src/customDialog.vue

@@ -1013,8 +1013,14 @@
                 (this.modelName.includes('item.') &&
                   con['target'][0].endsWith(this.modelName.split('.')[1])))
             ) {
-              val += `${item[con.from]}¯${this.jumpParamKey}:${
-                this.selectOrgs[index][this.jumpParamKey]
+              let jumpParamKey = this.jumpParamKey
+              let jumpParamValue = this.jumpParamKey
+              if (this.jumpParamKey.includes(':')) {
+                jumpParamKey = this.jumpParamKey.split(':')[0]
+                jumpParamValue = this.jumpParamKey.split(':')[1]
+              }
+              val += `${item[con.from]}¯${jumpParamKey}:${
+                this.selectOrgs[index][jumpParamValue]
               },`
             } else {
               val += item[con.from] + ','
@@ -1676,15 +1682,22 @@
                   (this.modelName.includes('item.') &&
                     con['target'][0].endsWith(this.modelName.split('.')[1])))
               ) {
+                // 如果有冒号 冒号前面是传值key 后面是取值key
+                let jumpParamKey = this.jumpParamKey
+                let jumpParamValue = this.jumpParamKey
+                if (this.jumpParamKey.includes(':')) {
+                  jumpParamKey = this.jumpParamKey.split(':')[0]
+                  jumpParamValue = this.jumpParamKey.split(':')[1]
+                }
                 // 需根据key 找到对应 返回数据的返回名称
                 let returnMap = returnStr.find((k) => {
                   return (
-                    k.field.toLowerCase() == this.jumpParamKey.toLowerCase()
+                    k.field.toLowerCase() == jumpParamValue.toLowerCase()
                   )
                 })
                 let returnMapKey = returnMap ? returnMap.comment : ''
                 val += `${decodeURIComponent(item[from])}¯${
-                  this.jumpParamKey
+                  jumpParamKey
                 }:${decodeURIComponent(item[returnMapKey])},`
               } else {
                 val += decodeURIComponent(item[from]) + ','

package/packages/CustomDialog/src/customMobileDialog.vue

@@ -936,8 +936,15 @@
                 (this.modelName.includes('item.') &&
                   con['target'][0].endsWith(this.modelName.split('.')[1])))
             ) {
-              val += `${item[con.from]}¯${this.jumpParamKey}:${
-                this.selectOrgs[index][this.jumpParamKey]
+              // 如果有冒号 冒号前面是传值key 后面是取值key
+              let jumpParamKey = this.jumpParamKey
+              let jumpParamValue = this.jumpParamKey
+              if (this.jumpParamKey.includes(':')) {
+                jumpParamKey = this.jumpParamKey.split(':')[0]
+                jumpParamValue = this.jumpParamKey.split(':')[1]
+              }
+              val += `${item[con.from]}¯${jumpParamKey}:${
+                this.selectOrgs[index][jumpParamValue]
               },`
             } else {
               val += item[con.from] + ','
@@ -1465,16 +1472,20 @@
                   (this.modelName.includes('item.') &&
                     con['target'][0].endsWith(this.modelName.split('.')[1])))
               ) {
+                let jumpParamKey = this.jumpParamKey
+                let jumpParamValue = this.jumpParamKey
+                if (this.jumpParamKey.includes(':')) {
+                  jumpParamKey = this.jumpParamKey.split(':')[0]
+                  jumpParamValue = this.jumpParamKey.split(':')[1]
+                }
                 // 需根据key 找到对应 返回数据的返回名称
                 let returnMap = returnStr.find((k) => {
-                  return (
-                    k.field.toLowerCase() == this.jumpParamKey.toLowerCase()
-                  )
+                  return k.field.toLowerCase() == jumpParamValue.toLowerCase()
                 })
                 let returnMapKey = returnMap ? returnMap.comment : ''
-                val += `${decodeURIComponent(item[from])}¯${
-                  this.jumpParamKey
-                }:${decodeURIComponent(item[returnMapKey])},`
+                val += `${decodeURIComponent(
+                  item[from]
+                )}¯${jumpParamKey}:${decodeURIComponent(item[returnMapKey])},`
               } else {
                 val += decodeURIComponent(item[from]) + ','
               }

package/packages/CustomDialog/src/main.vue

@@ -144,6 +144,29 @@
       <slot name="labeldesc">{{ inputName }}</slot>
     </span>
     <ht-field-tail :field-name="inputName" :input-value="value" />
+    <el-dialog
+      title="表单详情"
+      :visible.sync="isDialogFormShow"
+      v-if="isDialogFormShow"
+      width="100%"
+      custom-class="custom-dialog-form"
+      fullscreen
+      append-to-body
+    >
+      <div class="iframe-box">
+        <iframe
+          :src="mobileSrc"
+          width="100%"
+          frameborder="0"
+          style="height: 100%;"
+        ></iframe>
+      </div>
+      <div class="custom-dialog-form_footer">
+        <el-button size="smal" @click="isDialogFormShow = false">
+          关闭
+        </el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 <script>
@@ -182,6 +205,8 @@
     },
     data() {
       return {
+        mobileSrc: '',
+        isDialogFormShow: false,
         dialogConfig: null, // 对话框配置信息
         isEditInputShow: false,
         customValue: '',
@@ -316,7 +341,12 @@
             } else {
               endUrl += `&bnsToken=${token}&${item.jumpParamKey}=${item.jumpParamValue}`
             }
-            window.open(endUrl)
+            if (this.isMobile) {
+              this.mobileSrc = endUrl
+              this.isDialogFormShow = true
+            } else {
+              window.open(endUrl)
+            }
           } else {
             this.$message.info(res.message || '获取token失败！')
           }
@@ -484,7 +514,7 @@
       overflow-y: auto;
     }
     @media (max-width: 1280px) {
-      .el-dialog {
+      .el-dialog:not(.custom-dialog-form) {
         width: 96% !important;
         margin-top: 2vh !important;
       }
@@ -497,7 +527,7 @@
       }
     }
 
-    .el-dialog {
+    .el-dialog:not(.custom-dialog-form) {
       height: 90%;
       min-height: 400px;
     }
@@ -631,4 +661,24 @@
       }
     }
   }
+  ::v-deep .custom-dialog-form {
+    .el-dialog__header {
+      display: none;
+    }
+    .el-dialog__body {
+      height: 100%;
+      display: flex;
+      flex-direction: column;
+      .iframe-box {
+        width: 100%;
+        flex: 1;
+        overflow: hidden;
+      }
+      .custom-dialog-form_footer {
+        text-align: center;
+        margin-top: 10px;
+        padding-bottom: 10px;
+      }
+    }
+  }
 </style>