agilebuilder-ui 1.1.50-rc2 → 1.1.50-rc3

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

@@ -33,6 +33,7 @@
       :file-list="fileList"
       :system-code="systemCode"
       :before-remove="beforeRemove"
+      :watermark="watermark"
       :on-remove="onRemove"
       :before-download="beforeDownload"
       :downloadable="downloadable"

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

@@ -30,6 +30,7 @@
       :disabled-no-download="disabledNoDownload"
       :file-list="fileList"
       :system-code="systemCode"
+      :watermark="watermark"
       :before-remove="beforeRemove"
       :on-remove="onRemove"
       :before-download="beforeDownload"

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

@@ -20,12 +20,13 @@
                 </el-tooltip>
               </template>
               <el-tooltip v-if="!disabled || !disabledNoDownload" :content="t('fsUpload.download')" placement="top">
-                <el-icon style="margin-left: 10px" @click="handleDownload(file)">
+                <!-- <el-icon style="margin-left: 10px" @click="handleDownload(file)">
                   <Download />
-                </el-icon>
+                </el-icon> -->
+                <super-icon class="fs-preview-icon" @click="handleDownload(file)" iconValue="amb-color-icon-xiazai" />
               </el-tooltip>
               <el-tooltip v-if="!disabled" :content="t('fsUpload.delete')" placement="top">
-                <el-icon @click="handleOnRemove(file)"><Close /></el-icon>
+                <super-icon class="fs-preview-icon" @click="handleOnRemove(file)" iconValue="amb-color-icon-shanchu" />
               </el-tooltip>
             </div>
           </template>
@@ -61,7 +62,14 @@
 <script setup lang="ts">
 import { Close, Paperclip, Download } from '@element-plus/icons-vue'
 import { ref, defineProps } from 'vue'
-import { getSystemFrontendUrl, isPlateSys, isMobileBrowser, getReplaceUrlDomain, getRelativeBaseUrl, getKkFilePreviewUrl } from '../../../src/utils/common-util'
+import {
+  getSystemFrontendUrl,
+  isPlateSys,
+  isMobileBrowser,
+  getReplaceUrlDomain,
+  getRelativeBaseUrl,
+  getKkFilePreviewUrl
+} from '../../../src/utils/common-util'
 import { getToken } from '../../../src/utils/auth'
 import { isImage } from '../../../src/utils/util'
 import { Base64 } from 'js-base64'
@@ -125,7 +133,7 @@ const props = defineProps({
     default: false
   },
   // 水印配置{isShowWatermark:true/false,content:'xxxxx'}
-  watermark:{
+  watermark: {
     type: Object,
     default: () => ({})
   }
@@ -134,10 +142,10 @@ let baseURL = props.baseURL ? props.baseURL : window.$vueApp.config.globalProper
 let baseAPI = window.$vueApp.config.globalProperties.baseAPI
 baseURL = getRelativeBaseUrl(baseURL)
 baseAPI = getRelativeBaseUrl(baseAPI)
-if(!props.watermark.content){
+if (!props.watermark.content) {
   // 如果没有传水印配置，从按钮配置configure中获取
   props.watermark.isShowWatermark = props.configure.props?.watermark?.isShowWatermark===undefined?'true':props.configure.props?.watermark.isShowWatermark+''
-  props.watermark.content = props.configure.props.watermark.content
+  props.watermark.content = props.configure.props?.watermark?.content
 }
 const dialogVisible = ref<boolean>(false)
 const previewImageInfo = ref<any>({})
@@ -167,7 +175,7 @@ const download = (file: any) => {
   const showName = fileName.replace('#', '~~').replace('?', '~$').replace('&', '$')
   const isShowWatermark = props.watermark?.isShowWatermark
   let watermarkContent = props.watermark?.content
-  if(!watermarkContent){
+  if (!watermarkContent) {
     watermarkContent = ''
   }
   let url =
@@ -178,8 +186,10 @@ const download = (file: any) => {
     file.serverPath +
     '&jwt=' +
     token +
-    '&isShowWatermark='+isShowWatermark +
-    '&watermark='+encodeURI(watermarkContent)
+    '&isShowWatermark=' +
+    isShowWatermark +
+    '&watermark=' +
+    encodeURI(watermarkContent)
   if (isPlateSys(props.systemCode)) {
     url =
       baseAPI +
@@ -269,7 +279,7 @@ const previweDoc = (showName: string, serverPath: string) => {
       const myPreviewUrl = originUrl + '&fullfilename=' + showName
       console.log('myPreviewUrl====', myPreviewUrl)
       // http://127.0.0.1:8012/onlinePreview
-      getKkFilePreviewUrl(myPreviewUrl).then(url=>{
+      getKkFilePreviewUrl(myPreviewUrl).then((url) => {
         window.open(url, showName)
       })
       // previewUrl =
@@ -315,7 +325,23 @@ const isPreview = (fileName: string) => {
 </script>
 <style lang="scss" scoped>
 .amb-color-iconfont {
-  width: 30px;
-  height: 30px;
+  width: 25px;
+  height: 25px;
+}
+.fs-preview-icon {
+  font-size: 15px !important;
+  display: inline-block;
+  width: 1em !important;
+  height: 1em !important;
+  line-height: 1em;
+  cursor: pointer;
+
+  &:not(:first-of-type) {
+    margin-left: 20px;
+  }
+
+  & + & {
+    margin-left: 5px;
+  }
 }
 </style>

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

@@ -283,7 +283,7 @@ const props = defineProps({
     default: false
   },
   // 水印配置{isShowWatermark:true/false,content:'xxxxx'}
-  watermark:{
+  watermark: {
     type: Object,
     default: () => ({})
   }
@@ -302,10 +302,10 @@ console.log(
   'props.pageContext=',
   props.pageContext
 )
-if(!props.watermark.content){
+if (!props.watermark.content) {
   // 如果没有传水印配置，从按钮配置configure中获取
   props.watermark.isShowWatermark = props.configure?.props?.watermark?.isShowWatermark===undefined?'true':props.configure?.props?.watermark.isShowWatermark+''
-  props.watermark.content = props.configure?.props?.watermark.content
+  props.watermark.content = props.configure?.props?.watermark?.content
 }
 const listFileLabel = ref<string>('')
 if (props.displayType === 'input') {

package/packages/utils/value-set.js

@@ -24,11 +24,7 @@ function packageEnumAndBeanColumnValueSetsWhenPlate(columns, listCode) {
       const column = columns[i]
       const prop = column.prop ? column.prop : column.label
       const columnValueSet = packageEnumAndBeanColumnValueSet(column)
-      let titleValueSet = null
-      const titleValueSetJson = column.titleValueSet
-      if (titleValueSetJson) {
-        titleValueSet = column.titleValueSet
-      }
+      const titleValueSet = column.titleValueSet
       if (columnValueSet || titleValueSet) {
         const valueSetMeta = {
           prop: prop