three-trees-ui 1.0.7 → 1.0.8

package/packages/CustomDialog/src/main.vue

@@ -22,9 +22,14 @@
               v-for="(item, index) in inputVal"
               :key="item.value"
               class="el-tag el-tag--info el-tag--small"
-              @click="showEditInput"
+              @click.stop="jumpUrl(item)"
             >
-              <span class="el-select__tags-text">{{ item.value }}</span>
+              <span
+                class="el-select__tags-text"
+                :class="{ 'src-color': isSrcColor }"
+              >
+                {{ item.value }}
+              </span>
               <i
                 class="el-tag__close el-icon-close"
                 @click.stop="removeSelectOrg(index)"
@@ -94,9 +99,11 @@
         :key="item.value"
         class="el-tag el-tag--info el-tag--small"
         style="margin-right: 8px"
-        @click.stop
+        @click.stop="jumpUrl(item)"
       >
-        <span class="el-select__tags-text">{{ item.value }}</span>
+        <span class="el-select__tags-text" :class="{ 'src-color': isSrcColor }">
+          {{ item.value }}
+        </span>
       </span>
     </span>
     <custom-mobile-dialog
@@ -108,6 +115,8 @@
       :sun-index="sunIndex"
       :sub-path="subPath"
       :current-sub-data="currentSubData"
+      :dialog-config="dialogConfig"
+      :dialog-type="dialogType"
       @calacInputSuffixHeight="calacInputSuffixHeight"
       @updateInput="updateInput"
     ></custom-mobile-dialog>
@@ -122,6 +131,8 @@
       :sub-path="subPath"
       :current-sub-data="currentSubData"
       :is-read-only="!inputWriteable"
+      :dialog-config="dialogConfig"
+      :dialog-type="dialogType"
       @calacInputSuffixHeight="calacInputSuffixHeight"
       @updateInput="updateInput"
     ></custom-dialog>
@@ -159,9 +170,15 @@
       sunIndex: Number,
       subPath: String,
       currentSubData: Array,
+      dialogType: {
+        // search表示在查询条件使用 form表示在表单中使用
+        type: String,
+        default: 'form',
+      },
     },
     data() {
       return {
+        dialogConfig: null, // 对话框配置信息
         isEditInputShow: false,
         customValue: '',
         defualtTooltipplacement: 'bottom',
@@ -201,7 +218,19 @@
           }
           let result = []
           nameAry.forEach((m) => {
-            let n = { value: m }
+            // 带url跳转参数的 使用上横杆区分参数 值格式为 名称¯跳转key:跳转value
+            let n = {}
+            if (m.includes('¯') && m.split('¯')[1]) {
+              n.value = m.split('¯')[0]
+              let jumpParamStr = m.split('¯')[1]
+              if (jumpParamStr) {
+                let jumpParam = jumpParamStr.split(':')
+                n.jumpParamKey = jumpParam[0]
+                n.jumpParamValue = jumpParam[1]
+              }
+            } else {
+              n = { value: m }
+            }
             result.push(n)
           })
           return result
@@ -210,6 +239,19 @@
       isAllowCustom() {
         return this.custdialog && this.custdialog.allowInput
       },
+      // 是否展示可跳转颜色
+      isSrcColor() {
+        return (
+          this.dialogConfig &&
+          this.dialogType !== 'search' &&
+          ((this.isMobile && this.dialogConfig.mobileUrl) ||
+            (!this.isMobile && this.dialogConfig.pcUrl))
+        )
+      },
+    },
+    created() {
+      // 获取对话框配置，看是否有配置url跳转
+      this.getDialogConfig()
     },
     mounted() {
       const { subScopeEl } = utils.getSubScopeElAndIndex(this.$el)
@@ -234,6 +276,75 @@
       this.calacInputSuffixWidth()
     },
     methods: {
+      // 跳转url页面
+      jumpUrl(item) {
+        if (!this.isSrcColor) {
+          if (this.inputWriteable) {
+            this.showEditInput()
+          }
+          return
+        }
+        let url = this.isMobile
+          ? this.dialogConfig.mobileUrl
+          : this.dialogConfig.pcUrl
+        // 获取通用token 和 url翻译
+        Promise.all([
+          this.$requestConfig.getThreeTreeToken(),
+          this.transformUrl(url),
+        ]).then((res) => {
+          if (res[0] && res[0].code == 200) {
+            let token = res[0].value
+            let endUrl = res[1]
+            // 拼接参数 token和参数
+            if (endUrl.indexOf('?') == -1) {
+              endUrl += `?bnsToken=${token}&${item.jumpParamKey}=${item.jumpParamValue}`
+            } else {
+              endUrl += `&bnsToken=${token}&${item.jumpParamKey}=${item.jumpParamValue}`
+            }
+            window.open(endUrl)
+          } else {
+            this.$message.info(res.message || '获取token失败！')
+          }
+        })
+      },
+      // 替换url中域名通配符 需要发送接口
+      transformUrl(url) {
+        return new Promise((resolve) => {
+          var reg = /(\$\{(\w+)\})/
+          var match = reg.exec(url)
+          if (match) {
+            let alias = match[2]
+            if (alias) {
+              this.$requestConfig.getHostByAlias(alias).then((res) => {
+                if (res && res.value && res.value.rootAddress) {
+                  resolve(url.replace(match[1], res.value.rootAddress))
+                } else {
+                  resolve(url)
+                }
+              })
+            } else {
+              resolve(url)
+            }
+          } else {
+            resolve(url)
+          }
+        })
+      },
+      // 获取对话框配置
+      getDialogConfig() {
+        if (
+          this.custdialog &&
+          this.custdialog.custDialog &&
+          this.custdialog.custDialog.alias
+        )
+          this.$requestConfig
+            .getCustomDialogByAlias(this.custdialog.custDialog.alias)
+            .then((response) => {
+              if (response) {
+                this.dialogConfig = response
+              }
+            })
+      },
       editInputBlur() {
         this.$emit('input', this.customValue)
         this.isEditInputShow = false
@@ -483,4 +594,8 @@
     display: block;
     margin: 8px 0;
   }
+  .src-color {
+    cursor: pointer;
+    color: #409eff !important;
+  }
 </style>

package/packages/DimensionSelector/src/main.vue

@@ -269,6 +269,8 @@
               demNameAry.join(',')
             )
           }
+        } else {
+          this.$emit('change', newVal)
         }
         // 通过valueChange事件发布值变更消息
         this.$emit('valueChange', ary.join(','), newVal)

package/packages/Global/src/GlobalQuery.vue

@@ -62,7 +62,12 @@
                 //子表
                 const triggerPath = item.triggerField.split('.')
                 const triggerField = triggerPath[triggerPath.length - 1]
-                _this.subOldValueMap[item.subPath] = []
+                // 修复子表初始化时会触发关联查询的问题
+                _this.subOldValueMap[item.subPath] =
+                  utils.getValueByPath(
+                    _this.formInst,
+                    'data.' + item.subPath
+                  ) || []
                 item.triggerPath = triggerPath
                 item.triggerField = triggerField
                 item.resultBind = resultBind