vue2-client 1.19.70 → 1.19.71

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue2-client",
-  "version": "1.19.70",
+  "version": "1.19.71",
   "private": false,
   "scripts": {
     "serve": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint",

package/src/base-client/components/common/XDescriptions/XDescriptions.vue

@@ -1,174 +1,174 @@
-<template>
-  <div class="row">
-    <div class="content">
-      <a-skeleton :loading="loading" :paragraph="{ rows: 4 }" />
-      <div v-show="!loading">
-        <template v-if="!loadError">
-          <a-descriptions v-if="realData" :column="isMobile ? 1 : column" size="small" :title="title">
-            <a-descriptions-item
-              v-for="(value, key) in realData"
-              :key="key"
-              :label="key">
-              {{ formatText(value) }}
-            </a-descriptions-item>
-          </a-descriptions>
-        </template>
-        <template v-else>
-          <a-empty>
-            <span slot="description"> 页面配置不存在，请联系系统管理员 </span>
-          </a-empty>
-        </template>
-      </div>
-    </div>
-    <div class="extra" v-if="extraShow">
-      <slot name="addonAfter"/>
-    </div>
-  </div>
-</template>
-<script>
-
-import { mapState } from 'vuex'
-import { getRealKeyData } from '@vue2-client/utils/formatter'
-import { getConfigByName } from '@vue2-client/services/api/common'
-
-export default {
-  name: 'XDescriptions',
-  components: {
-  },
-  props: {
-    // 标题
-    title: {
-      type: String,
-      required: true
-    },
-    // 内容
-    content: {
-      type: Object,
-      required: true
-    },
-    // 模型名
-    model: {
-      type: String,
-      required: false,
-      default: ''
-    },
-    // 配置名称
-    configName: {
-      type: String,
-      required: true
-    },
-    // 配置所属命名空间
-    serviceName: {
-      type: String,
-      default: undefined
-    },
-    env: {
-      type: String,
-      default: 'prod'
-    },
-    // 每列显示数量
-    column: {
-      type: Number,
-      default: 2
-    },
-    // 每列显示数量
-    getRealData: {
-      type: Boolean,
-      default: false
-    },
-    // 是否展示插槽
-    extraShow: {
-      type: Boolean,
-      default: true
-    }
-  },
-  created () {
-    this.initConfig()
-  },
-  data () {
-    return {
-      // 加载状态
-      loading: false,
-      loadError: false,
-      realData: undefined
-    }
-  },
-  computed: {
-    ...mapState('setting', { isMobile: 'isMobile' })
-  },
-  methods: {
-    initConfig () {
-      this.loading = true
-      this.loadError = false
-      if (this.configName) {
-        this.getConfig()
-      } else {
-        this.loading = false
-        this.loadError = true
-      }
-    },
-    getConfig () {
-      getConfigByName(this.configName, this.serviceName, (res) => {
-        const mapIndex = {}
-        const result = {}
-        if (res.formJson) {
-          res.formJson.filter(item => {
-            const model = item.model
-            return model.indexOf(this.model) > 0
-          })[0].groupItems.forEach(item => {
-            mapIndex[item.model.substring(item.model.indexOf('_') + 1)] = item.name
-          })
-          for (const key of Object.keys(this.content)) {
-            const name = mapIndex[key]
-            if (name) {
-              result[name] = this.content[key]
-            } else {
-              result[key] = this.content[key]
-            }
-          }
-        } else if (res.column) {
-          // [{label:'标签1',filed:'字段1'}]
-          let content = {}
-          if (this.getRealData) {
-            content = getRealKeyData(this.content)
-          } else {
-            content = this.content
-          }
-          if (typeof content === 'string') {
-            content = JSON.parse(content)
-          }
-          res.column.forEach(item => {
-            result[item.label] = content[item.filed]
-          })
-        }
-        this.realData = result
-        this.loading = false
-      }, this.env === 'dev')
-    },
-    // 文字格式化
-    formatText (value) {
-      return value ?? '--'
-    }
-  }
-}
-</script>
-<style>
-.row {
-  display: flex;
-
-  .content {
-    -webkit-box-flex: 1;
-    flex: auto;
-    -ms-flex: auto;
-  }
-
-  .extra {
-    flex: 0 1 auto;
-    -webkit-box-flex: 0;
-    -ms-flex: 0 1 auto;
-    min-width: 242px;
-    margin-left: 88px;
-    text-align: right;
-  }
-}
-</style>
+<template>
+  <div class="row">
+    <div class="content">
+      <a-skeleton :loading="loading" :paragraph="{ rows: 4 }" />
+      <div v-show="!loading">
+        <template v-if="!loadError">
+          <a-descriptions v-if="realData" :column="isMobile ? 1 : column" size="small" :title="title">
+            <a-descriptions-item
+              v-for="(value, key) in realData"
+              :key="key"
+              :label="key">
+              {{ formatText(value) }}
+            </a-descriptions-item>
+          </a-descriptions>
+        </template>
+        <template v-else>
+          <a-empty>
+            <span slot="description"> 页面配置不存在，请联系系统管理员 </span>
+          </a-empty>
+        </template>
+      </div>
+    </div>
+    <div class="extra" v-if="extraShow">
+      <slot name="addonAfter"/>
+    </div>
+  </div>
+</template>
+<script>
+
+import { mapState } from 'vuex'
+import { getRealKeyData } from '@vue2-client/utils/formatter'
+import { getConfigByName } from '@vue2-client/services/api/common'
+
+export default {
+  name: 'XDescriptions',
+  components: {
+  },
+  props: {
+    // 标题
+    title: {
+      type: String,
+      required: true
+    },
+    // 内容
+    content: {
+      type: Object,
+      required: true
+    },
+    // 模型名
+    model: {
+      type: String,
+      required: false,
+      default: ''
+    },
+    // 配置名称
+    configName: {
+      type: String,
+      required: true
+    },
+    // 配置所属命名空间
+    serviceName: {
+      type: String,
+      default: undefined
+    },
+    env: {
+      type: String,
+      default: 'prod'
+    },
+    // 每列显示数量
+    column: {
+      type: Number,
+      default: 2
+    },
+    // 每列显示数量
+    getRealData: {
+      type: Boolean,
+      default: false
+    },
+    // 是否展示插槽
+    extraShow: {
+      type: Boolean,
+      default: true
+    }
+  },
+  created () {
+    this.initConfig()
+  },
+  data () {
+    return {
+      // 加载状态
+      loading: false,
+      loadError: false,
+      realData: undefined
+    }
+  },
+  computed: {
+    ...mapState('setting', { isMobile: 'isMobile' })
+  },
+  methods: {
+    initConfig () {
+      this.loading = true
+      this.loadError = false
+      if (this.configName) {
+        this.getConfig()
+      } else {
+        this.loading = false
+        this.loadError = true
+      }
+    },
+    getConfig () {
+      getConfigByName(this.configName, this.serviceName, (res) => {
+        const mapIndex = {}
+        const result = {}
+        if (res.formJson) {
+          res.formJson.filter(item => {
+            const model = item.model
+            return model.indexOf(this.model) > 0
+          })[0].groupItems.forEach(item => {
+            mapIndex[item.model.substring(item.model.indexOf('_') + 1)] = item.name
+          })
+          for (const key of Object.keys(this.content)) {
+            const name = mapIndex[key]
+            if (name) {
+              result[name] = this.content[key]
+            } else {
+              result[key] = this.content[key]
+            }
+          }
+        } else if (res.column) {
+          // [{label:'标签1',filed:'字段1'}]
+          let content = {}
+          if (this.getRealData) {
+            content = getRealKeyData(this.content)
+          } else {
+            content = this.content
+          }
+          if (typeof content === 'string') {
+            content = JSON.parse(content)
+          }
+          res.column.forEach(item => {
+            result[item.label] = content[item.filed]
+          })
+        }
+        this.realData = result
+        this.loading = false
+      }, this.env === 'dev')
+    },
+    // 文字格式化
+    formatText (value) {
+      return value ?? '--'
+    }
+  }
+}
+</script>
+<style>
+.row {
+  display: flex;
+
+  .content {
+    -webkit-box-flex: 1;
+    flex: auto;
+    -ms-flex: auto;
+  }
+
+  .extra {
+    flex: 0 1 auto;
+    -webkit-box-flex: 0;
+    -ms-flex: 0 1 auto;
+    min-width: 242px;
+    margin-left: 88px;
+    text-align: right;
+  }
+}
+</style>

package/src/base-client/components/common/XDescriptions/XDescriptionsGroup.vue

@@ -50,7 +50,19 @@
                   <span v-if="isFieldRequired(item, data)" style="color: red">*</span>
                 </template>
                 <span :style="getFieldStyle(item, data)">
-                  {{ formatFieldValue(item.value, item, data) || '--' }}
+                  <!-- 超链接样式兼容 -->
+                  <template v-if="item.isLink">
+                    <span role="link"
+                          tabindex="0"
+                          class="link-text"
+                          @click="handleLinkClick(item, data, $event)"
+                          @keyup.enter="handleLinkClick(item, data, $event)">
+                      {{ formatFieldValue(item.value, item, data) || '--' }}
+                    </span>
+                  </template>
+                  <template v-else>
+                    {{ formatFieldValue(item.value, item, data) || '--' }}
+                  </template>
                   <a-button
                     v-if="item.canEdit"
                     type="link"
@@ -111,7 +123,20 @@
                       <span v-if="isFieldRequired(fieldItem, data)" style="color: red">*</span>
                     </template>
                     <span :style="getFieldStyle(fieldItem, fieldItem.value, data)">
-                      {{ formatFieldValue(fieldItem.value, fieldItem, data) || '--' }}
+                      <!-- 超链接样式兼容 - 修复变量引用错误 -->
+                      <template v-if="fieldItem.isLink">
+                        <span role="link"
+                              tabindex="0"
+                              class="link-text"
+                              @click="handleLinkClick(fieldItem, data, $event)"
+                              @keyup.enter="handleLinkClick(fieldItem, data, $event)"
+                        >
+                          {{ formatFieldValue(fieldItem.value, fieldItem, data) || '--' }}
+                        </span>
+                      </template>
+                      <template v-else>
+                        {{ formatFieldValue(fieldItem.value, fieldItem, data) || '--' }}
+                      </template>
                       <a-button
                         v-if="fieldItem.canEdit"
                         type="link"
@@ -168,7 +193,19 @@
                   <span v-if="isFieldRequired(item, data)" style="color: red">*</span>
                 </template>
                 <span :style="getFieldStyle(item, item.value, data)">
-                  {{ formatFieldValue(item.value, item, data) || '--' }}
+                  <template v-if="item.isLink">
+                    <span role="link"
+                          tabindex="0"
+                          class="link-text"
+                          @click="handleLinkClick(item, data, $event)"
+                          @keyup.enter="handleLinkClick(item, data, $event)"
+                    >
+                      {{ formatFieldValue(item.value, item, data) || '--' }}
+                    </span>
+                  </template>
+                  <template v-else>
+                    {{ formatFieldValue(item.value, item, data) || '--' }}
+                  </template>
                   <a-button
                     v-if="item.canEdit"
                     type="link"
@@ -308,7 +345,8 @@ export default {
                   styleFunc: field.styleFunc,
                   formatFunc: field.formatFunc,
                   requireFunc: field.requireFunc,
-                  canEdit: field.canEdit === true
+                  canEdit: field.canEdit === true,
+                  isLink: field.isLink === true
                 }))
               }
 
@@ -405,6 +443,9 @@ export default {
             styleFunc: typeof fieldValue === 'object' ? fieldValue.styleFunc : undefined,
             formatFunc: typeof fieldValue === 'object' ? fieldValue.formatFunc : undefined,
             requireFunc: typeof fieldValue === 'object' ? fieldValue.requireFunc : undefined,
+            canEdit: typeof fieldValue === 'object' ? fieldValue.canEdit : undefined,
+            // 新增超链接配置
+            isLink: typeof fieldValue === 'object' ? fieldValue.isLink : undefined,
             ...(typeof fieldValue === 'object' ? fieldValue : {})
           }))
         }
@@ -436,6 +477,7 @@ export default {
     },
     // 格式化字段值
     formatFieldValue(value, field, data) {
+      console.log('formatFieldValue', value, field, data)
       if (!field.formatFunc) return value
       try {
         return executeStrFunctionByContext(this, field.formatFunc, [data, field.key])
@@ -469,6 +511,16 @@ export default {
         data: this.data
       })
     },
+    // 处理超链接点击
+    handleLinkClick(field, data, event) {
+      event.stopPropagation()
+      // 向父组件抛出事件
+      this.$emit('link-click', {
+        field,
+        value: field.value,
+        data: this.data
+      })
+    },
     onScroll() {
       // 只在 left 模式启用滚动联动
       if (this.tabMode !== 'left') return
@@ -550,6 +602,22 @@ export default {
     overflow-y: scroll;
   }
 
+  .link-text {
+    color: @primary-color;
+    text-decoration: none;
+    cursor: pointer;
+    outline: none;
+
+    &:hover {
+      text-decoration: underline;
+    }
+
+    &:focus {
+      text-decoration: underline;
+      box-shadow: 0 0 0 2px fade(@primary-color, 20%);
+    }
+  }
+
   // top 模式样式
   .tab-content-scroll {
     overflow-y: auto;