three-trees-ui 1.0.15 → 1.0.17

package/packages/CustomDialog/src/main.vue

@@ -25,15 +25,10 @@
             <span
               v-for="(item, index) in inputVal"
               :key="item.value"
-              class="el-tag el-tag--info el-tag--small no-background"
-              @click.stop="jumpUrl(item)"
+              class="el-tag el-tag--info el-tag--small"
+              @click="showEditInput"
             >
-              <span
-                class="el-select__tags-text"
-                :class="{ 'src-color': isSrcColor }"
-              >
-                {{ item.value }}
-              </span>
+              <span class="el-select__tags-text">{{ item.value }}</span>
               <i
                 class="el-tag__close el-icon-close"
                 @click.stop="removeSelectOrg(index)"
@@ -97,17 +92,15 @@
         </div>
       </div>
     </el-tooltip>
-    <span v-if="!inputWriteable" class="dialog-readonly">
+    <span v-if="!inputWriteable">
       <span
         v-for="item in inputVal"
         :key="item.value"
-        class="el-tag el-tag--info el-tag--small no-background"
+        class="el-tag el-tag--info el-tag--small"
         style="margin-right: 8px"
-        @click.stop="jumpUrl(item)"
+        @click.stop
       >
-        <span class="el-select__tags-text" :class="{ 'src-color': isSrcColor }">
-          {{ item.value }}
-        </span>
+        <span class="el-select__tags-text">{{ item.value }}</span>
       </span>
     </span>
     <custom-mobile-dialog
@@ -119,8 +112,6 @@
       :sun-index="sunIndex"
       :sub-path="subPath"
       :current-sub-data="currentSubData"
-      :dialog-config="dialogConfig"
-      :dialog-type="dialogType"
       @calacInputSuffixHeight="calacInputSuffixHeight"
       @updateInput="updateInput"
     ></custom-mobile-dialog>
@@ -135,8 +126,6 @@
       :sub-path="subPath"
       :current-sub-data="currentSubData"
       :is-read-only="!inputWriteable"
-      :dialog-config="dialogConfig"
-      :dialog-type="dialogType"
       @calacInputSuffixHeight="calacInputSuffixHeight"
       @updateInput="updateInput"
     ></custom-dialog>
@@ -144,29 +133,6 @@
       <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>
@@ -197,17 +163,9 @@
       sunIndex: Number,
       subPath: String,
       currentSubData: Array,
-      dialogType: {
-        // search表示在查询条件使用 form表示在表单中使用
-        type: String,
-        default: 'form',
-      },
     },
     data() {
       return {
-        mobileSrc: '',
-        isDialogFormShow: false,
-        dialogConfig: null, // 对话框配置信息
         isEditInputShow: false,
         customValue: '',
         defualtTooltipplacement: 'bottom',
@@ -247,25 +205,7 @@
           }
           let result = []
           nameAry.forEach((m) => {
-            // 带url跳转参数的 使用上横杆区分参数 值格式为 名称¯跳转key:跳转value
-            // 上横向保存数据库后 有可能被改变此处兼容写了一种上横线
-            let n = {}
-            if (
-              (m.includes('¯') && m.split('¯')[1]) ||
-              (m.includes('ˉ') && m.split('ˉ')[1])
-            ) {
-              let val1 = m.includes('¯') ? m.split('¯')[0] : m.split('ˉ')[0]
-              let val2 = m.includes('¯') ? m.split('¯')[1] : m.split('ˉ')[1]
-              n.value = val1
-              let jumpParamStr = val2
-              if (jumpParamStr) {
-                let jumpParam = jumpParamStr.split(':')
-                n.jumpParamKey = jumpParam[0]
-                n.jumpParamValue = jumpParam[1]
-              }
-            } else {
-              n = { value: m }
-            }
+            let n = { value: m }
             result.push(n)
           })
           return result
@@ -274,19 +214,6 @@
       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() {
       setTimeout(() => {
@@ -310,86 +237,9 @@
         }
         //获取对话框按钮名称宽度
         this.calacInputSuffixWidth()
-        if (this.value && this.inputWriteable) {
-          this.calacInputSuffixHeight()
-        }
       }, 50)
     },
     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}`
-            }
-            if (this.isMobile) {
-              this.mobileSrc = endUrl
-              this.isDialogFormShow = true
-            } else {
-              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
@@ -514,7 +364,7 @@
       overflow-y: auto;
     }
     @media (max-width: 1280px) {
-      .el-dialog:not(.custom-dialog-form) {
+      .el-dialog {
         width: 96% !important;
         margin-top: 2vh !important;
       }
@@ -527,7 +377,7 @@
       }
     }
 
-    .el-dialog:not(.custom-dialog-form) {
+    .el-dialog {
       height: 90%;
       min-height: 400px;
     }
@@ -639,46 +489,4 @@
     display: block;
     margin: 8px 0;
   }
-  .src-color {
-    cursor: pointer;
-    color: #409eff !important;
-  }
-  .el-tag.el-tag--info.no-background {
-    background: none;
-    border: none;
-  }
-  .dialog-readonly {
-    & > .el-tag {
-      &::after {
-        display: inline;
-        content: ',';
-      }
-    }
-    & > .el-tag:last-child {
-      &::after {
-        display: none;
-        content: '';
-      }
-    }
-  }
-  ::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>

package/packages/DimensionSelector/src/main.vue

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

package/packages/Global/src/GlobalQuery.vue

@@ -27,6 +27,11 @@
       if (!this.formInst) {
         this.formInst = utils.getOnlineFormInstance(this.$parent)
       }
+      // 如果是只读时不触发关联查询
+      if (this.formInst.isView === true) {
+        return
+      }
+
       if (this.queryJson.length > 0) {
         let _this = this
         this.queryJson.forEach((item) => {

package/packages/Input/src/main.vue

@@ -303,6 +303,9 @@
       const _me = this
       const exp = this.mathExp
       const formVm = utils.getOnlineFormInstance(_me)
+      if (formVm && formVm.isView === true) {
+        return
+      }
       // 初始化流水号配置
       this.initIdentity(_me, formVm)
       // 数学运算表达式

package/packages/Tree/src/main.vue

@@ -267,18 +267,13 @@
         return (
           this.data &&
           this.data.length < 1 &&
-          this.treeData &&
-          this.treeData.length < 1
+          this.treeData && this.treeData.length < 1
         )
       },
     },
     watch: {
       filterText(val) {
-        if (this.lazy) {
-          this.$emit('loadALL', val)
-        } else {
-          this.$refs.elTree.filter(val)
-        }
+        this.$refs.elTree.filter(val)
       },
       defaultCheckedKeys(val) {
         this.$refs.elTree.setCheckedKeys(val)

package/src/directive/formulas.js

@@ -15,6 +15,10 @@ const conformanceJudge = (value, vnode) => {
 
 const formula = {
   bind(el, binding, vnode) {
+    // 如果是只读的就不执行js脚本计算
+    if (el && el.__vue__ && el.formIsView === true) {
+      return
+    }
     if (!conformanceJudge(binding.value.value, vnode)) {
       return
     }
@@ -46,6 +50,10 @@ const formula = {
     }
   },
   update(el, binding, vnode) {
+    // 如果是只读的就不执行js脚本计算
+    if (el && el.__vue__ && el.formIsView === true) {
+      return
+    }
     if (!conformanceJudge(binding.value.value, vnode)) {
       return
     }

package/src/mixins/permission.js

@@ -69,6 +69,10 @@ export default {
     }
     if (parent) {
       this.formIsView = parent.$options.propsData.isView
+      // 如果是只读 第一时间将状态改为flase 避免渲染
+      if (this.formIsView === true) {
+        this.writeable = false
+      }
     }
   },
   mounted() {