agilebuilder-ui 1.1.47 → 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/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/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
+          }
         }
       }
     }

package/packages/super-grid/src/custom-formatter.js

@@ -1,5 +1,5 @@
 import { $emit } from '../../utils/gogocodeTransfer'
-import { doFormat } from './formatter'
+import { doFormat, formatDateTime } from './formatter'
 import store from './store'
 import { initialization, jumpToPage } from '../../../src/utils/jump-page-utils'
 import { analysisFileSetObj, otherFilesToStandard } from './utils'
@@ -198,9 +198,10 @@ const customFormatter = {
       jumpPageJson = column.formatter.options.format
     }
     if (jumpPageJson && jumpPageJson !== '') {
+      const jumpPageJsonObject = JSON.parse(jumpPageJson)
       // 解析是否需要显示该超链接
       const result = initialization(
-        JSON.parse(jumpPageJson),
+        jumpPageJsonObject,
         row,
         isSql,
         additionalParamerter,
@@ -227,6 +228,18 @@ const customFormatter = {
       hyperLinkResult.label = this.objectPropValueTwo(row, column)
       hyperLinkResult.title = hyperLinkResult.label
     }
+    if (hyperLinkResult.jumpPageItem) {
+      const jumpSetting = hyperLinkResult.jumpPageItem.jumpPageSetting
+      if (jumpSetting && jumpSetting.displayTextFormatType && jumpSetting.displayTextFormat) {
+        const formatValue = formatDateTime(
+          jumpSetting.displayTextFormatType,
+          hyperLinkResult.label,
+          jumpSetting.displayTextFormat
+        )
+        hyperLinkResult.label = formatValue
+        hyperLinkResult.title = formatValue
+      }
+    }
     return hyperLinkResult
   },
   // 点击超链接

package/packages/super-grid/src/dynamic-input.vue

@@ -1,7 +1,9 @@
 <template>
   <div
     v-if="type && type.indexOf('custom:') >= 0 && componentName != ''"
-    :class="!this.isFormSubTable && row.validateErrorField && row.validateErrorField === column.prop ?'required_bg':''"
+    :class="
+      !this.isFormSubTable && row.validateErrorField && row.validateErrorField === column.prop ? 'required_bg' : ''
+    "
   >
     <component
       :is="componentName"
@@ -26,7 +28,12 @@
       @input="cellEvent('input', $event)"
     />
   </div>
-  <div v-else :class="!this.isFormSubTable && row.validateErrorField && row.validateErrorField === column.prop ?'required_bg':''">
+  <div
+    v-else
+    :class="
+      !this.isFormSubTable && row.validateErrorField && row.validateErrorField === column.prop ? 'required_bg' : ''
+    "
+  >
     <!--必须有@input ,否则无法输入值-->
     <el-date-picker
       v-if="type === 'year' || type === 'month' || type === 'week'"
@@ -293,6 +300,7 @@
       @delete="deleteFile"
       @delete-success="deleteSuccess"
       @upload-success="uploadOnSuccess"
+      @on-error="onError"
     />
     <multipart-upload
       v-else-if="type === 'multipartUpload'"
@@ -768,7 +776,7 @@ export default {
       designProperty, // 字段配置
       myCustomParams: {},
       systemCode,
-      isFormSubTable: false  // 是否是表单子表
+      isFormSubTable: false // 是否是表单子表
     }
   },
   computed: {},
@@ -1143,7 +1151,7 @@ export default {
         // 在callCustomEvent方法中使用了innerValue属性
         this.innerValue = event
         $emit(this, 'update:value', event)
-       this.clearValidateErrorField()
+        this.clearValidateErrorField()
         isInputVal = true
       } else if (eventName === 'blur' && !this.isSelectControll()) {
         // 为了使输入时流畅，所以在blur时调用input，更改组件的数据
@@ -1205,8 +1213,8 @@ export default {
       this.watchScanValueChange(this.innerValue)
     },
     // 清空单元格必填样式
-    clearValidateErrorField(){
-      if(this.row.validateErrorField){
+    clearValidateErrorField() {
+      if (this.row.validateErrorField) {
         this.row.validateErrorField = undefined
       }
     },
@@ -2089,6 +2097,26 @@ export default {
       } else {
         this.departmentInfo = []
       }
+    },
+    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)
+        }
+        this.$message({
+          type: 'error',
+          message: message,
+          showClose: true
+        })
+      } else {
+        this.$message({
+          type: 'error',
+          message: this.$t('fsUpload.uploadFailed'),
+          showClose: true
+        })
+      }
     }
   }
 }

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

@@ -179,7 +179,7 @@ export function doFormatWithValueSet(column, value) {
           label.push(item[0].label)
         }
       })
-      if(label.length > 0){
+      if (label.length > 0) {
         value = label.join(',')
       }
     } else {
@@ -194,3 +194,7 @@ export function doFormatWithValueSet(column, value) {
   }
   return value
 }
+
+export function formatDateTime(type, value, format) {
+  return formatter[type](value, { format: format })
+}