agilebuilder-ui 1.1.46 → 1.1.48-rc1

package/packages/fs-upload/src/fs-upload-multi.vue

@@ -172,6 +172,7 @@ import {getToken} from '../../../src/utils/auth'
 import {
 	isPlateSys,
 	getSystemFrontendUrl,
+  getRelativeBaseUrl,
 } from '../../../src//utils//common-util.js'
 
 export default {
@@ -276,7 +277,7 @@ export default {
 		},
 	},
 	created() {
-		this.baseURL = window.$vueApp.config.globalProperties.baseURL
+		this.baseURL = getRelativeBaseUrl(window.$vueApp.config.globalProperties.baseURL)
 		if (this.data) {
 			this.unifiedEnclosures = this.data
 		}
@@ -332,7 +333,7 @@ export default {
 				const http = this.$http
 				http
 						.post(
-								window.$vueApp.config.globalProperties.baseURL +
+								this.baseURL +
 								'/common/fs-upload/des-encrypt',
 								map
 						)
@@ -366,7 +367,7 @@ export default {
 				} else {
 					const myShowName = row.fileName
 					const uuid = row.uuid
-					let baseUrl = window.$vueApp.config.globalProperties.baseURL
+					let baseUrl = this.baseURL
 					if (isPlateSys(window.$vueApp.config.globalProperties.systemCode)) {
 						baseUrl = window.$vueApp.config.globalProperties.baseAPI
 					}
@@ -392,6 +393,7 @@ export default {
 							'&serverPath=' +
 							uuid
 					}
+					previewUrl = getRelativeBaseUrl(previewUrl)
 					window.open(previewUrl, showName)
 				}
 			}
@@ -419,7 +421,7 @@ export default {
 				http.headers = "'Content-Type': 'multipart/form-data'"
 				http
 						.post(
-								window.$vueApp.config.globalProperties.baseURL +
+								this.baseURL +
 								'/common/fs-upload/upload-template/' +
 								this.systemCode,
 								param,

package/packages/fs-upload/src/fs-upload-single.vue

@@ -112,7 +112,7 @@ import {
 import {$emit} from '../../utils/gogocodeTransfer'
 import Cookies from 'js-cookie'
 import seeBigPicture from './see-big-picture.vue'
-import {getSystemFrontendUrl, isPlateSys,} from '../../../src/utils/common-util.js'
+import {getRelativeBaseUrl, getSystemFrontendUrl, isPlateSys,} from '../../../src/utils/common-util.js'
 import {getToken} from '../../../src/utils/auth'
 
 export default {
@@ -194,10 +194,11 @@ export default {
 		data: {
 			type: Array,
 			default: null,
+			baseURL: null
 		},
 	},
 	created() {
-		this.baseURL = window.$vueApp.config.globalProperties.baseURL
+		this.baseURL = getRelativeBaseUrl(window.$vueApp.config.globalProperties.baseURL)
 		if (this.data) {
 			this.unifiedEnclosure = this.data[0]
 		}
@@ -260,7 +261,7 @@ export default {
 				const http = this.$http
 				http
 						.post(
-								window.$vueApp.config.globalProperties.baseURL +
+								this.baseURL +
 								'/common/fs-upload/des-encrypt',
 								map
 						)
@@ -294,9 +295,9 @@ export default {
 				} else {
 					const myShowName = this.unifiedEnclosure.fileName
 					const uuid = this.unifiedEnclosure.uuid
-					let baseUrl = window.$vueApp.config.globalProperties.baseURL
+					let baseUrl = this.baseURL
 					if (isPlateSys(window.$vueApp.config.globalProperties.systemCode)) {
-						baseUrl = window.$vueApp.config.globalProperties.baseAPI
+						baseUrl = getRelativeBaseUrl(window.$vueApp.config.globalProperties.baseAPI)
 					}
 					let previewUrl
 					if (window.$vueApp.config.globalProperties.kkFileViewUrl) {
@@ -335,7 +336,7 @@ export default {
 			}
 			http
 					.post(
-							window.$vueApp.config.globalProperties.baseURL +
+							this.baseURL +
 							'/common/fs-upload/upload-template/' +
 							this.systemCode,
 							param,

package/packages/fs-upload/src/fs-upload.vue

@@ -38,6 +38,7 @@ import { $on, $off, $once, $emit } from '../../utils/gogocodeTransfer'
 import fsUploadMulti from './fs-upload-multi.vue'
 import fsUploadSingle from './fs-upload-single.vue'
 import * as Vue from 'vue'
+import { getRelativeBaseUrl } from '../../../src/utils/common-util'
 export default {
   name: 'FsUpload',
   components: {
@@ -175,9 +176,10 @@ export default {
     deleteFile(deleteUuid) {
       const http = this.$http
       const list = [deleteUuid]
+      const baseURL = getRelativeBaseUrl(window.$vueApp.config.globalProperties.baseURL)
       http
         .delete(
-          window.$vueApp.config.globalProperties.baseURL + '/common/fs-upload',
+          baseURL + '/common/fs-upload',
           { data: list }
         )
         .then((data) => {})

package/packages/fs-upload/src/see-big-picture.vue

@@ -42,6 +42,7 @@
 </template>
 
 <script>
+import { getRelativeBaseUrl } from '../../../src/utils/common-util'
 export default {
   props: {
     unifiedEnclosures: {
@@ -56,9 +57,11 @@ export default {
   data() {
     return {
       displayIndex: 0,
+      baseURL: null
     }
   },
   created() {
+    this.baseURL = getRelativeBaseUrl(window.$vueApp.config.globalProperties.baseURL)
     this.displayIndex = this.showIndex
   },
   methods: {},

package/packages/fs-upload-list/src/fs-upload-list.vue

@@ -21,6 +21,7 @@
               :show-file-list="false"
               :headers="headers"
               :on-success="uploadOnSuccess"
+              :on-error="onError"
               :with-credentials="true"
               name="file"
             >
@@ -73,7 +74,7 @@ import { $emit } from '../../utils/gogocodeTransfer'
 
 import { getToken } from '../../../src/utils/auth'
 import { isImage } from '../../../src/utils/util'
-import { getSystemFrontendUrl, isPlateSys, isMobileBrowser } from '../../../src/utils/common-util'
+import { getSystemFrontendUrl, isPlateSys, isMobileBrowser, getRelativeBaseUrl } from '../../../src/utils/common-util'
 import FsPreview from '../../fs-preview/src/fs-preview.vue'
 import { packageFile } from '../../super-grid/src/utils'
 import FileUploadInputMobile from '../../fs-upload-new/src/file-upload-mobile/file-upload-input.vue'
@@ -159,6 +160,7 @@ export default {
     if (isPlateSys(window.$vueApp.config.globalProperties.systemCode)) {
       defaultAction = window.$vueApp.config.globalProperties.baseAPI + '/component/super-form/uploads'
     }
+    defaultAction = getRelativeBaseUrl(defaultAction)
     const isMobile = isMobileBrowser()
     const systemCode = this.pageContext && this.pageContext.systemCode ? this.pageContext.systemCode : null
     return {
@@ -310,9 +312,13 @@ export default {
     },
     getFileIconByName(fileName) {
       return getFileIconByName(fileName)
+    },
+    onError(error) {
+      $emit(this, 'on-error', error)
+
     }
   },
-  emits: ['close', 'upload-success', 'delete-success', 'delete', 'update:value', 'close', 'update:value']
+  emits: ['close', 'upload-success', 'delete-success', 'delete', 'update:value', 'close', 'update:value', 'on-error']
 }
 </script>
 <style lang="scss" scoped>

package/packages/fs-upload-new/src/fs-button-upload.vue

@@ -14,6 +14,7 @@
       :before-upload="handleBeforeUpload"
       :before-remove="beforeRemove"
       :on-success="onSuccess"
+      :on-error="onError"
     >
       <el-button size="small" type="primary">{{ placeholder }}</el-button>
       <template #tip>
@@ -40,13 +41,15 @@
 </template>
 
 <script setup lang="ts">
-import { ref, defineProps } from 'vue'
-import { getSystemFrontendUrl, isPlateSys } from '../../../src/utils/common-util'
+import { ref, defineProps, defineEmits } from 'vue'
+import { getRelativeBaseUrl, getSystemFrontendUrl, isPlateSys } from '../../../src/utils/common-util'
 import { getToken } from '../../../src/utils/auth'
 import type { UploadFile, UploadFiles } from 'element-plus'
 import fsPreviewNew from './fs-preview-new.vue'
 import { ElMessage } from 'element-plus'
 import { useI18n } from 'vue-i18n'
+
+const emits = defineEmits(['on-error'])
 const { t } = useI18n()
 const props = defineProps({
   openFsUpload: {
@@ -138,8 +141,8 @@ const props = defineProps({
     default: 0
   }
 })
-const baseURL = window.$vueApp.config.globalProperties.baseURL
-const baseAPI = window.$vueApp.config.globalProperties.baseAPI
+const baseURL = getRelativeBaseUrl(window.$vueApp.config.globalProperties.baseURL)
+const baseAPI = getRelativeBaseUrl(window.$vueApp.config.globalProperties.baseAPI)
 const defaultAction = ref<string>('')
 const buttonUploadRef = ref()
 const innerLimitFileSize = ref(props.limitFileSize)
@@ -200,4 +203,8 @@ const onSuccess = (response: any, uploadFile: UploadFile, uploadFiles: UploadFil
   })
   props.onSuccess(response, uploadFile, uploadFiles)
 }
+
+const onError = (error: any) => {
+  emits('on-error', error)
+}
 </script>

package/packages/fs-upload-new/src/fs-drag-upload.vue

@@ -12,6 +12,7 @@
     :before-upload="handleBeforeUpload"
     :on-success="onUploadSuccess"
     :before-remove="beforeRemove"
+    :on-error="onError"
   >
     <el-icon class="el-icon--upload"><upload-filled /></el-icon>
     <div class="el-upload__text">{{ placeholder }}</div>
@@ -38,13 +39,15 @@
 
 <script setup lang="ts">
 import { UploadFilled } from '@element-plus/icons-vue'
-import { ref, defineProps } from 'vue'
-import { getSystemFrontendUrl, isPlateSys } from '../../../src/utils/common-util'
+import { ref, defineProps, defineEmits } from 'vue'
+import { getRelativeBaseUrl, getSystemFrontendUrl, isPlateSys } from '../../../src/utils/common-util'
 import { getToken } from '../../../src/utils/auth'
 import type { UploadFile, UploadFiles } from 'element-plus'
 import fsPreviewNew from './fs-preview-new.vue'
 import { ElMessage } from 'element-plus'
 import { useI18n } from 'vue-i18n'
+
+const emits = defineEmits(['on-error'])
 const { t } = useI18n()
 const props = defineProps({
   openFsUpload: {
@@ -136,8 +139,8 @@ const props = defineProps({
     default: 0
   }
 })
-const baseURL = window.$vueApp.config.globalProperties.baseURL
-const baseAPI = window.$vueApp.config.globalProperties.baseAPI
+const baseURL = getRelativeBaseUrl(window.$vueApp.config.globalProperties.baseURL)
+const baseAPI = getRelativeBaseUrl(window.$vueApp.config.globalProperties.baseAPI)
 const defaultAction = ref<string>('')
 const innerLimitFileSize = ref(props.limitFileSize)
 if (props.action) {
@@ -197,4 +200,8 @@ const onUploadSuccess = (response: any, uploadFile: UploadFile, uploadFiles: Upl
   })
   props.onSuccess(response, uploadFile, uploadFiles)
 }
+
+const onError = (error: any) => {
+  emits('on-error', error)
+}
 </script>

package/packages/fs-upload-new/src/fs-preview-new.vue

@@ -61,7 +61,7 @@
 <script setup lang="ts">
 import { Close, Paperclip, Download } from '@element-plus/icons-vue'
 import { ref, defineProps } from 'vue'
-import { getSystemFrontendUrl, isPlateSys, isMobileBrowser, getReplaceUrlDomain } from '../../../src/utils/common-util'
+import { getSystemFrontendUrl, isPlateSys, isMobileBrowser, getReplaceUrlDomain, getRelativeBaseUrl } from '../../../src/utils/common-util'
 import { getToken } from '../../../src/utils/auth'
 import { isImage } from '../../../src/utils/util'
 import { Base64 } from 'js-base64'
@@ -125,8 +125,10 @@ const props = defineProps({
     default: false
   }
 })
-const baseURL = props.baseURL ? props.baseURL : window.$vueApp.config.globalProperties.baseURL
-const baseAPI = window.$vueApp.config.globalProperties.baseAPI
+let baseURL = props.baseURL ? props.baseURL : window.$vueApp.config.globalProperties.baseURL
+let baseAPI = window.$vueApp.config.globalProperties.baseAPI
+baseURL = getRelativeBaseUrl(baseURL)
+baseAPI = getRelativeBaseUrl(baseAPI)
 
 const dialogVisible = ref<boolean>(false)
 const previewImageInfo = ref<any>({})
@@ -233,9 +235,9 @@ const previweDoc = (showName: string, serverPath: string) => {
       showName
     )
   } else {
-    let baseUrl = window.$vueApp.config.globalProperties.baseURL
+    let baseUrl = baseURL
     if (isPlateSys(window.$vueApp.config.globalProperties.systemCode)) {
-      baseUrl = window.$vueApp.config.globalProperties.baseAPI
+      baseUrl = baseAPI
     }
     let previewUrl
     if (window.$vueApp.config.globalProperties.kkFileViewUrl) {
@@ -258,6 +260,7 @@ const previweDoc = (showName: string, serverPath: string) => {
       previewUrl = baseUrl + '/common/fs-upload/preview?jwt=' + token
       previewUrl = previewUrl + '&showName=' + encodeURI(showName) + '&serverPath=' + serverPath
     }
+    previewUrl = getRelativeBaseUrl(previewUrl)
     window.open(previewUrl, showName)
   }
 }

package/packages/fs-upload-new/src/fs-upload-new.vue

@@ -17,6 +17,7 @@
     }"
     @upload-success="onInputUploadSuccess"
     @delete-success="onInputDeleteSuccess"
+    @on-error="onError"
   />
   <fs-button-upload
     v-else-if="!isMobile && displayType === 'button'"
@@ -135,6 +136,9 @@ import FileUploadInputMobile from './file-upload-mobile/file-upload-input.vue'
 import FsUploadList from '../../fs-upload-list/src/fs-upload-list.vue'
 import { ref, defineProps } from 'vue'
 import { getReplaceUrlDomain, isMobileBrowser, isPlateSys } from '../../../src/utils/common-util'
+import { useI18n } from 'vue-i18n'
+import { ElMessage } from 'element-plus'
+const { t } = useI18n()
 const props = defineProps({
   openFsUpload: {
     type: Object,
@@ -377,5 +381,18 @@ function uploadFileDone(data) {
     fileUploadRef.value.uploadFileDone(data)
   }
 }
+
+function onError(error) {
+  console.error('Upload error:', error)
+  if (error.message) {
+    let message = JSON.parse(error.message)
+    if (message && message.message) {
+      message = JSON.parse(message.message)
+    }
+    ElMessage.error(message)
+  } else {
+    ElMessage.error(t('fsUpload.uploadFailed'))
+  }
+}
 defineExpose({ pickFileDone, uploadFileDone })
 </script>

package/packages/index.js

@@ -1,8 +1,8 @@
 import '../src/utils/insert_css' // 公共样式库
 // 依次导入组件库的各个组件
 import { resizeDirective } from '../src/utils/resize'
-import '../src/utils/iframe-communicator';
-import store from '../src/store';
+import '../src/utils/iframe-communicator'
+import store from '../src/store'
 import Breadcrumb from './breadcrumb'
 import DepartmentTree from './department-tree'
 import Hamburger from './hamburger'
@@ -44,8 +44,9 @@ import FsUploadNew from './fs-upload-new'
 import ScanCodeInputBrowser from './scan-code-input-browser'
 import WorkgroupTreeMobile from './workgroup-tree-mobile'
 import RowForm from './row-form'
-import * as ElementPlusIconsVue from "@element-plus/icons-vue"
-import YxAffix from '../src/components/Affix';
+import * as ElementPlusIconsVue from '@element-plus/icons-vue'
+import YxAffix from '../src/components/Affix'
+import ChatEmbed from './chat-embed'
 // 将所有组件都存储起来,方便后续统一注册
 const components = [
   YxAffix,
@@ -81,11 +82,12 @@ const components = [
   IntervalSelection,
   DepartmentTreeMobile,
   DepartmentUserTreeMobile,
-	SuperIcon,
-	FsUploadNew,
+  SuperIcon,
+  FsUploadNew,
   ScanCodeInputBrowser,
   WorkgroupTreeMobile,
-  RowForm
+  RowForm,
+  ChatEmbed
 ]
 
 // 定义 install 方法，接收 Vue 作为参数。如果使用 use 注册插件，则所有的组件都将被注册
@@ -106,8 +108,8 @@ const install = function (Vue) {
     Vue.component(key, component)
   }
   // store挂载到Vue原型
-  Vue.provide('$agilebuilderUIStore', store);
-  if(Vue.config.globalProperties) Vue.config.globalProperties.$agilebuilderUIStore = store;
+  Vue.provide('$agilebuilderUIStore', store)
+  if (Vue.config.globalProperties) Vue.config.globalProperties.$agilebuilderUIStore = store
 }
 
 //  判断是否是直接引入vue的js文件，即全局引用可自动安装所有组件
@@ -146,16 +148,17 @@ export {
   SecretInfo,
   DepartmentTreeMobile,
   DepartmentUserTreeMobile,
-	SuperIcon,
-	FsUploadNew,
+  SuperIcon,
+  FsUploadNew,
   ScanCodeInputBrowser,
   WorkgroupTreeMobile,
-  RowForm
+  RowForm,
+  ChatEmbed
 }
 
 export default {
   // 导出的对象必须具有 install，才能被 Vue.use() 方法安装
   install,
   store,
-  ...components,
+  ...components
 }

package/packages/json-view/index.ts

@@ -0,0 +1,3 @@
+import JsonView from './json-view.vue'
+import JsonViewDialog from './json-view-dialog.vue'
+export { JsonView, JsonViewDialog }

package/packages/json-view/json-view-dialog.vue

@@ -0,0 +1,53 @@
+<template>
+  <el-dialog
+    append-to-body
+    v-model="showJsonVisible"
+    :append-to-body="appendToBody"
+    :title="title"
+    width="600"
+    @close="close"
+  >
+    <json-view :jsonObject="jsonObject" />
+  </el-dialog>
+</template>
+<script lang="ts" setup>
+import { ref, defineEmits, defineProps, defineOptions, watch } from 'vue'
+defineOptions({
+  name: 'JsonViewDialog',
+  inheritAttrs: false
+})
+import JsonView from './json-view.vue'
+const props = defineProps({
+  jsonObject: {
+    type: Object,
+    default: () => {}
+  },
+  appendToBody: {
+    type: Boolean,
+    default: false
+  },
+  modelValue: {
+    type: Boolean,
+    default: false
+  },
+  title: {
+    type: String,
+    default: 'JSON 预览'
+  }
+})
+const emits = defineEmits(['update:modelValue'])
+const showJsonVisible = ref(false)
+watch(
+  () => props.modelValue,
+  (newVal) => {
+    if (newVal) {
+      showJsonVisible.value = true
+    }
+  }
+)
+const close = () => {
+  showJsonVisible.value = false
+  emits('update:modelValue', false)
+}
+</script>
+<style scoped></style>

package/packages/json-view/json-view.vue

@@ -0,0 +1,126 @@
+<template>
+  <div
+    :style="{
+      width: '100%'
+    }"
+    ref="cfCodemirrorJsonViewRef"
+    id="cf-codemirror-view-json"
+  ></div>
+</template>
+<script lang="ts" setup>
+import { ref, defineProps, defineOptions, watch, nextTick, onMounted } from 'vue'
+defineOptions({
+  name: 'JsonView',
+  inheritAttrs: false
+})
+import { basicSetup, EditorView } from 'codemirror'
+import { jsonLanguage } from '@codemirror/lang-json'
+import { EditorState, Facet } from '@codemirror/state'
+
+const props = defineProps({
+  jsonObject: {
+    type: Object,
+    default: () => {}
+  },
+  height: {
+    type: Number,
+    default: 0
+  },
+  theme: {
+    type: String,
+    default: null
+  }
+})
+const editor = ref<any>(null)
+const cfCodemirrorJsonViewRef = ref()
+const codemirrorHeight = ref('400px')
+watch(
+  () => props.jsonObject,
+  (newVal) => {
+    if (editor.value) {
+      // 更新 CodeMirror 中的值
+      loadEditor()
+    }
+  },
+  { deep: true }
+)
+onMounted(() => {
+  nextTick(() => {
+    loadEditor()
+  })
+})
+
+function loadEditor() {
+  if (editor.value) {
+    editor.value.destroy()
+  }
+  const jsonStr = props.jsonObject ? JSON.stringify(props.jsonObject, null, 2) : ''
+  if (props.height) {
+    codemirrorHeight.value = props.height + 'px'
+  } else {
+    if (cfCodemirrorJsonViewRef.value) {
+      const rect = cfCodemirrorJsonViewRef.value.getBoundingClientRect()
+      if (rect.y || rect.y === 0) {
+        console.log('window.innerHeight - rect.y', window.innerHeight, rect.y)
+        codemirrorHeight.value = window.innerHeight - rect.y - 100 + 'px'
+      }
+    }
+  }
+  const state = getEditorState(jsonStr)
+  let element: Element | null = document.getElementById('cf-codemirror-view-json')
+  if (element) {
+    editor.value = new EditorView({
+      state,
+      parent: element
+    })
+  }
+}
+// 获取编辑器状态
+function getEditorState(jsonStr: string) {
+  // 获取主题
+  const mytheme = getTheme()
+  // 基本主题样式，主要设置字体大小和高度
+  const baseTheme = EditorView.theme({
+    '.cm-content, .cm-gutter': { minHeight: codemirrorHeight.value },
+    '&': {
+      height: codemirrorHeight.value,
+      maxHeight: codemirrorHeight.value,
+      fontSize: '12px'
+    }
+  })
+  return EditorState.create({
+    doc: jsonStr,
+    extensions: [
+      EditorState.tabSize.of(16),
+      basicSetup,
+      jsonLanguage,
+      mytheme,
+      baseTheme,
+      readOnlyFacet.of(true),
+      preventChanges
+    ]
+  })
+}
+
+// 创建一个新的 Facet
+const readOnlyFacet = Facet.define<boolean, boolean>({ combine: (values) => values.some((a) => a) })
+
+// 创建一个新的 StateField 来监听更改
+const preventChanges = EditorState.transactionFilter.of((tr: any) => {
+  if (tr.isUserEvent && tr.docChanged && tr.state.facet(readOnlyFacet)) {
+    return {
+      changes: {
+        from: tr.changes.from,
+        to: tr.changes.to,
+        insert: tr.startState.doc.sliceString(tr.changes.from, tr.changes.to)
+      }
+    }
+  }
+  return tr
+})
+
+function getTheme() {
+  return EditorView.theme({})
+}
+</script>
+<style scoped></style>

package/packages/plugins/export-data-new.js

@@ -4,6 +4,7 @@ import store from '../super-grid/src/store'
 import {getExtraParam} from '../super-grid/src/utils'
 import nineGridStore from '../super-nine-grid/src/store'
 import {packageEnumAndBeanColumnValueSets} from '../utils/value-set'
+import { getRelativeBaseUrl } from '../../src/utils/common-util'
 
 /**
  *
@@ -327,6 +328,7 @@ function exportListData(
       if(!baseUrl){
         baseUrl = window.$vueApp.config.globalProperties.baseURL
       }
+      baseUrl = getRelativeBaseUrl(baseUrl)
       window.$vueApp.config.globalProperties.$http
         .post(
           baseUrl +

package/packages/super-grid/src/apis.js

@@ -1460,6 +1460,17 @@ const apis = {
   },
   getCustomFunc(funcName) {
     window.$PageUtil.getCustomFunc(this.pageContext, funcName)
+  },
+  addRequiredClass(fieldName,listCode, rowIndex, pageNum) {
+    const gridParams = store.get(listCode)
+    if (this.isFormSubTable && this.isSubTableShowPage){
+      rowIndex = rowIndex - 1
+      if(pageNum !== this.currentPage){
+        this.currentPage = pageNum
+        this.changePage(pageNum)
+      }
+    }
+    gridParams.gridData[rowIndex]['validateErrorField'] = fieldName
   }
 }
 export default apis

package/packages/super-grid/src/components/grid-icon.vue

@@ -3,11 +3,12 @@
     <span v-if="formatConfig.isTag">
       <el-tag
         v-if="displayText"
-        :type="customStyle.type"
+        :type="customStyle.type || formatConfig.tagType"
         :color="customStyle.color"
-        :effect="formatConfig.effect"
+        :effect="formatConfig.tagEffect"
         :size="formatConfig.size"
         :hit="formatConfig.hit"
+        :round="customStyle.round || formatConfig.round"
       >
         {{ displayText }}
       </el-tag>
@@ -144,7 +145,9 @@ export default {
             this.customStyle = result
           })
         } else {
-          this.customStyle = customEventResult
+          if (customEventResult) {
+            this.customStyle = customEventResult
+          }
         }
       }
     }