agilebuilder-ui 1.1.49 → 1.1.50-rc2

package/lib/{tab-content-iframe-index-483b398c.js → tab-content-iframe-index-d96ad21a.js}

@@ -1,5 +1,5 @@
 import { openBlock as r, createElementBlock as t, createCommentVNode as o } from "vue";
-import { _ as s } from "./index-7a601895.js";
+import { _ as s } from "./index-05d842ab.js";
 const u = ["src"], f = s({ data: () => ({ src: null }), watch: { $route(n, c) {
   this.src = this.$route.query.src;
 } }, mounted() {

package/lib/{tab-content-index-0862686f.js → tab-content-index-93a36198.js}

@@ -1,4 +1,4 @@
-import { _ as f, c as _, g as x, b as P, s as h, m as M, M as O, i as I } from "./index-7a601895.js";
+import { _ as f, c as _, g as x, b as P, s as h, m as M, M as O, i as I } from "./index-05d842ab.js";
 import { resolveComponent as u, openBlock as l, createBlock as b, withCtx as g, createVNode as v, TransitionGroup as L, createElementBlock as p, Fragment as C, renderList as T, createElementVNode as m, toDisplayString as w, normalizeClass as S, createCommentVNode as y } from "vue";
 const k = { class: "no-redirect" }, A = f({ name: "Breadcrumb", data: () => ({ levelList: null }), computed: { levelListWithTitle() {
   return this.levelList.filter((e) => e.meta.title !== void 0 && e.meta.title !== null);

package/lib/{tache-subprocess-history-c80e8ed2.js → tache-subprocess-history-cb6f4ab6.js}

@@ -1,5 +1,5 @@
 import { resolveComponent as t, openBlock as a, createElementBlock as s, createElementVNode as y, createVNode as l, withCtx as r, createTextVNode as n, toDisplayString as p, createCommentVNode as c, createBlock as h } from "vue";
-import { _ as I } from "./index-7a601895.js";
+import { _ as I } from "./index-05d842ab.js";
 const g = { style: { "padding-bottom": "10px" } }, k = { key: 0, class: "graphDiv" }, N = I({ name: "TacheSubprocessHistory", data: () => ({ type: "graph", workflowId: null }), created() {
   const o = this.$route.query.workflowId;
   o && (this.workflowId = parseInt(o));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agilebuilder-ui",
-  "version": "1.1.49",
+  "version": "1.1.50-rc2",
   "type": "module",
   "private": false,
   "main": "./lib/super-ui.js",

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

@@ -84,7 +84,7 @@
 // import { Image } from 'antd';
 import { Paperclip as ElIconPaperclip, View as ElIconView, Download as ElIconDownload } from '@element-plus/icons-vue'
 import * as Vue from 'vue'
-import { isPlateSys, getSystemFrontendUrl, getRelativeBaseUrl } from '../../../src/utils/common-util'
+import { isPlateSys, getSystemFrontendUrl, getRelativeBaseUrl, getKkFilePreviewUrl } from '../../../src/utils/common-util'
 import { isImage, getEntityFieldValue } from '../../../src/utils/util'
 import { packageFile } from '../../super-grid/src/utils'
 import { getToken } from '../../../src/utils/auth'
@@ -134,6 +134,11 @@ export default {
     enableDelete: {
       type: Boolean,
       default: false
+    },
+    // 水印配置{isShowWatermark:true/false,content:'xxxxx'}
+    watermark:{
+      type: Object,
+      default: () => ({})
     }
   },
   data() {
@@ -293,17 +298,20 @@ export default {
           const myPreviewUrl = originUrl + '&fullfilename=' + showName
           console.log('myPreviewUrl====', myPreviewUrl)
           // http://127.0.0.1:8012/onlinePreview
-          previewUrl =
-            window.$vueApp.config.globalProperties.kkFileViewUrl +
-            '?url=' +
-            encodeURIComponent(Base64.encode(myPreviewUrl))
+          getKkFilePreviewUrl(myPreviewUrl).then(url=>{
+            window.open(url, showName)
+          })
+            // window.$vueApp.config.globalProperties.kkFileViewUrl +
+            // '?url=' +
+            // encodeURIComponent(Base64.encode(myPreviewUrl))
+          /window.open(previewUrl, showName)
           console.log('previewUrl====', previewUrl)
         } else {
           previewUrl = baseUrl + '/common/fs-upload/preview?jwt=' + token
           previewUrl = previewUrl + '&showName=' + encodeURI(showName) + '&serverPath=' + fileInfo.serverPath
+          previewUrl = getRelativeBaseUrl(previewUrl)
+          window.open(previewUrl, showName)
         }
-        previewUrl = getRelativeBaseUrl(previewUrl)
-        window.open(previewUrl, showName)
       }
     },
     donwloadFile(index) {
@@ -317,12 +325,17 @@ export default {
     },
     download(showName, serverPath) {
       const token = getToken()
+      const isShowWatermark = this.watermark.isShowWatermark
+      let watermarkContent = this.watermark?.content
+      if(!watermarkContent){
+        watermarkContent = ''
+      }
       let url = window.$vueApp.config.globalProperties.baseURL + '/common/super-form/downloads?jwt=' + token
       if (isPlateSys(window.$vueApp.config.globalProperties.systemCode)) {
         url = window.$vueApp.config.globalProperties.baseAPI + '/component/super-form/downloads?jwt=' + token
       }
       url = getRelativeBaseUrl(url)
-      const src = url + '&showName=' + encodeURI(showName) + '&serverPath=' + serverPath
+      const src = url + '&showName=' + encodeURI(showName) + '&serverPath=' + serverPath+'&isShowWatermark='+isShowWatermark+'&watermark='+watermarkContent
       window.open(src)
     },
     analysisFileSetObj(fileSetObj, isSql) {

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

@@ -173,6 +173,7 @@ import {
 	isPlateSys,
 	getSystemFrontendUrl,
   getRelativeBaseUrl,
+  getKkFilePreviewUrl,
 } from '../../../src//utils//common-util.js'
 
 export default {
@@ -381,7 +382,10 @@ export default {
 						//要预览文件的访问地址
 						const myPreviewUrl = originUrl + '&fullfilename='+myShowName
 						// http://127.0.0.1:8012/onlinePreview
-						previewUrl = window.$vueApp.config.globalProperties.kkFileViewUrl+'?url='+encodeURIComponent(Base64.encode(myPreviewUrl))
+						getKkFilePreviewUrl(myPreviewUrl).then(url=>{
+							window.open(url, showName)
+						})
+						// previewUrl = window.$vueApp.config.globalProperties.kkFileViewUrl+'?url='+encodeURIComponent(Base64.encode(myPreviewUrl))
 					} else {
 						previewUrl =
 						baseUrl +
@@ -392,9 +396,9 @@ export default {
 							encodeURI(myShowName) +
 							'&serverPath=' +
 							uuid
+						previewUrl = getRelativeBaseUrl(previewUrl)
+						window.open(previewUrl, showName)
 					}
-					previewUrl = getRelativeBaseUrl(previewUrl)
-					window.open(previewUrl, showName)
 				}
 			}
 		},

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 {getRelativeBaseUrl, getSystemFrontendUrl, isPlateSys,} from '../../../src/utils/common-util.js'
+import {getKkFilePreviewUrl, getRelativeBaseUrl, getSystemFrontendUrl, isPlateSys,} from '../../../src/utils/common-util.js'
 import {getToken} from '../../../src/utils/auth'
 
 export default {
@@ -309,7 +309,10 @@ export default {
 						//要预览文件的访问地址
 						const myPreviewUrl = originUrl + '&fullfilename='+myShowName
 						// http://127.0.0.1:8012/onlinePreview
-						previewUrl = window.$vueApp.config.globalProperties.kkFileViewUrl+'?url='+encodeURIComponent(Base64.encode(myPreviewUrl))
+						getKkFilePreviewUrl(myPreviewUrl).then(url=>{
+							window.open(url, showName)
+						})
+						// previewUrl = window.$vueApp.config.globalProperties.kkFileViewUrl+'?url='+encodeURIComponent(Base64.encode(myPreviewUrl))
 					} else {
 						previewUrl =
 						baseUrl +
@@ -320,8 +323,8 @@ export default {
 							encodeURI(myShowName) +
 							'&serverPath=' +
 							uuid
+						window.open(previewUrl, showName)
 					}
-					window.open(previewUrl, showName)
 				}
 			}
 		},

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

@@ -10,6 +10,7 @@
           :file-set-obj="fileSetObj"
           :is-sql="isSql"
           :label="value"
+          :watermark="watermark"
           @delete-file="deleteRow"
         >
           <template #prefix>
@@ -53,6 +54,7 @@
         :componentId="componentId"
         :listCode="listCode"
         :openCameraOrChoosePhoto="fileSetObj.openCameraOrChoosePhoto"
+        :watermark="watermark"
       />
     </template>
     <template v-else>
@@ -63,6 +65,7 @@
         :file-set-obj="fileSetObj"
         :is-sql="isSql"
         :label="value"
+        :watermark="watermark"
       />
     </template>
   </span>
@@ -163,6 +166,7 @@ export default {
     defaultAction = getRelativeBaseUrl(defaultAction)
     const isMobile = isMobileBrowser()
     const systemCode = this.pageContext && this.pageContext.systemCode ? this.pageContext.systemCode : null
+    const watermark = this.fileSetObj.watermark
     return {
       deleteUuids: [],
       headers,
@@ -174,7 +178,8 @@ export default {
       previewImageInfo: {},
       showFileList: this.fileList,
       isMobile,
-      systemCode
+      systemCode,
+      watermark
     }
   },
   components: {

package/packages/fs-upload-new/src/file-upload-mobile/file-upload-app.vue

@@ -12,6 +12,7 @@
       :onRemove="onRemove"
       :beforeDownload="beforeDownload"
       :baseURL="baseURLVal"
+      :watermark="watermark"
       @chooseFile="pickBrowserFiles"
       @remove="removeFile"
     />
@@ -137,6 +138,11 @@ const props = defineProps({
   beforeUpload: {
     type: Function,
     default: () => {}
+  },
+  // 水印配置{isShowWatermark:true/false,content:'xxxxx'}
+  watermark:{
+    type: Object,
+    default: () => ({})
   }
 })
 

package/packages/fs-upload-new/src/file-upload-mobile/file-upload-browser.vue

@@ -12,6 +12,7 @@
       :onRemove="onRemove"
       :beforeDownload="beforeDownload"
       :baseURL="baseURLVal"
+      :watermark="watermark"
       @chooseFile="pickBrowserFiles"
       @remove="removeFile"
     />
@@ -180,6 +181,11 @@ const props = defineProps({
   beforeUpload: {
     type: Function,
     default: () => {}
+  },
+  // 水印配置{isShowWatermark:true/false,content:'xxxxx'}
+  watermark:{
+    type: Object,
+    default: () => ({})
   }
 })
 

package/packages/fs-upload-new/src/file-upload-mobile/file-upload-component.vue

@@ -14,7 +14,7 @@
             {{file.name}}
         </div></div>
         <img v-else class="el-upload-list__item-thumbnail" :src="getPreviewSrc(file.showName?file.showName: file.name, file.serverPath)" alt="" />
-        <fs-preview-new :disabled="disabled" :file-list="fileListResult" :file="file" :system-code="systemCode" :before-remove="beforeRemove" :on-remove="onRemove" :before-download="beforeDownload" @remove="removeFile"/>
+        <fs-preview-new :disabled="disabled" :file-list="fileListResult" :file="file" :system-code="systemCode" :watermark="watermark" :before-remove="beforeRemove" :on-remove="onRemove" :before-download="beforeDownload" @remove="removeFile"/>
 
       </div>
     </template>
@@ -66,6 +66,11 @@ const props = defineProps({
   baseURL: {
     type: String,
     default: ''
+  },
+  // 水印配置{isShowWatermark:true/false,content:'xxxxx'}
+  watermark:{
+    type: Object,
+    default: () => ({})
   }
 })
 

package/packages/fs-upload-new/src/file-upload-mobile/file-upload-input.vue

@@ -45,6 +45,7 @@
         :componentName="componentName"
         :listCode="listCode"
         :openCameraOrChoosePhoto="openCameraOrChoosePhoto"
+        :watermark="watermark"
         @uploadend="uploadendMobile"
         @remove="removeMobileFile"
       />
@@ -171,6 +172,11 @@ const props = defineProps({
   beforeUpload: {
     type: Function,
     default: () => {}
+  },
+  // 水印配置{isShowWatermark:true/false,content:'xxxxx'}
+  watermark:{
+    type: Object,
+    default: () => ({})
   }
 })
 

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

@@ -26,6 +26,7 @@
       :componentName="componentName"
       :listCode="listCode"
       :openCameraOrChoosePhoto="openCameraOrChoosePhoto"
+      :watermark="watermark"
       @uploadend="uploadedFile"
       @remove="removeFile"
     />
@@ -55,6 +56,7 @@
       :componentName="componentName"
       :listCode="listCode"
       :openCameraOrChoosePhoto="openCameraOrChoosePhoto"
+      :watermark="watermark"
       @uploadend="uploadedFile"
       @remove="removeFile"
     />
@@ -181,6 +183,11 @@ const props = defineProps({
   beforeUpload: {
     type: Function,
     default: () => {}
+  },
+  // 水印配置{isShowWatermark:true/false,content:'xxxxx'}
+  watermark:{
+    type: Object,
+    default: () => ({})
   }
 })
 const baseAPI = window.$vueApp.config.globalProperties.baseAPI

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

@@ -139,6 +139,11 @@ const props = defineProps({
   limit: {
     type: Number,
     default: 0
+  },
+  // 水印配置{isShowWatermark:true/false,content:'xxxxx'}
+  watermark:{
+    type: Object,
+    default: () => ({})
   }
 })
 const baseURL = getRelativeBaseUrl(window.$vueApp.config.globalProperties.baseURL)

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

@@ -137,6 +137,11 @@ const props = defineProps({
   limit: {
     type: Number,
     default: 0
+  },
+  // 水印配置{isShowWatermark:true/false,content:'xxxxx'}
+  watermark:{
+    type: Object,
+    default: () => ({})
   }
 })
 const baseURL = getRelativeBaseUrl(window.$vueApp.config.globalProperties.baseURL)

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, getRelativeBaseUrl } 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'
@@ -123,13 +123,22 @@ const props = defineProps({
   disabledNoDownload: {
     type: Boolean,
     default: false
+  },
+  // 水印配置{isShowWatermark:true/false,content:'xxxxx'}
+  watermark:{
+    type: Object,
+    default: () => ({})
   }
 })
 let baseURL = props.baseURL ? props.baseURL : window.$vueApp.config.globalProperties.baseURL
 let baseAPI = window.$vueApp.config.globalProperties.baseAPI
 baseURL = getRelativeBaseUrl(baseURL)
 baseAPI = getRelativeBaseUrl(baseAPI)
-
+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
+}
 const dialogVisible = ref<boolean>(false)
 const previewImageInfo = ref<any>({})
 const previewSrcList = ref<string[]>([])
@@ -156,6 +165,11 @@ const download = (file: any) => {
   const token = getToken()
   const fileName = file.showName ? file.showName : file.name
   const showName = fileName.replace('#', '~~').replace('?', '~$').replace('&', '$')
+  const isShowWatermark = props.watermark?.isShowWatermark
+  let watermarkContent = props.watermark?.content
+  if(!watermarkContent){
+    watermarkContent = ''
+  }
   let url =
     baseURL +
     '/common/super-form/downloads?showName=' +
@@ -163,8 +177,10 @@ const download = (file: any) => {
     '&serverPath=' +
     file.serverPath +
     '&jwt=' +
-    token
-  if (!isPlateSys(props.systemCode)) {
+    token +
+    '&isShowWatermark='+isShowWatermark +
+    '&watermark='+encodeURI(watermarkContent)
+  if (isPlateSys(props.systemCode)) {
     url =
       baseAPI +
       '/component/super-form/downloads?showName=' +
@@ -253,15 +269,18 @@ const previweDoc = (showName: string, serverPath: string) => {
       const myPreviewUrl = originUrl + '&fullfilename=' + showName
       console.log('myPreviewUrl====', myPreviewUrl)
       // http://127.0.0.1:8012/onlinePreview
-      previewUrl =
-        window.$vueApp.config.globalProperties.kkFileViewUrl + '?url=' + encodeURIComponent(Base64.encode(myPreviewUrl))
+      getKkFilePreviewUrl(myPreviewUrl).then(url=>{
+        window.open(url, showName)
+      })
+      // previewUrl =
+      //   window.$vueApp.config.globalProperties.kkFileViewUrl + '?url=' + encodeURIComponent(Base64.encode(myPreviewUrl))
       console.log('previewUrl====', previewUrl)
     } else {
       previewUrl = baseUrl + '/common/fs-upload/preview?jwt=' + token
       previewUrl = previewUrl + '&showName=' + encodeURI(showName) + '&serverPath=' + serverPath
+      previewUrl = getRelativeBaseUrl(previewUrl)
+      window.open(previewUrl, showName)
     }
-    previewUrl = getRelativeBaseUrl(previewUrl)
-    window.open(previewUrl, showName)
   }
 }
 function getPreviewSrc(showName: string, serverPath: string) {

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

@@ -13,7 +13,8 @@
       multiple: multiple,
       limitFileSize: limitFileSize,
       limit: limitNum,
-      downloadable: downloadable
+      downloadable: downloadable,
+      watermark: watermark
     }"
     @upload-success="onInputUploadSuccess"
     @delete-success="onInputDeleteSuccess"
@@ -41,6 +42,7 @@
     :beforeDownload="beforeDownload"
     :pageContext="pageContext"
     :configure="configure"
+    :watermark="watermark"
     :openFsUpload="openFsUpload"
   />
   <fs-drag-upload
@@ -58,6 +60,7 @@
     :action="action"
     :headers="headers"
     :file-list="fileList"
+    :watermark="watermark"
     :beforeUpload="beforeUpload"
     :onSuccess="onSuccess"
     :beforeRemove="beforeRemove"
@@ -83,6 +86,7 @@
     :action="action"
     :headers="headers"
     :file-list="fileList"
+    :watermark="watermark"
     :beforeUpload="beforeUpload"
     :onSuccess="onSuccess"
     :beforeRemove="beforeRemove"
@@ -112,6 +116,7 @@
     :action="action"
     :headers="headers"
     :file-list="fileList"
+    :watermark="watermark"
     :beforeUpload="beforeUpload"
     :onSuccess="onSuccess"
     :beforeRemove="beforeRemove"
@@ -276,6 +281,11 @@ const props = defineProps({
   disabledNoDownload: {
     type: Boolean,
     default: false
+  },
+  // 水印配置{isShowWatermark:true/false,content:'xxxxx'}
+  watermark:{
+    type: Object,
+    default: () => ({})
   }
 })
 const isMobile = ref(isMobileBrowser())
@@ -292,6 +302,11 @@ console.log(
   'props.pageContext=',
   props.pageContext
 )
+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
+}
 const listFileLabel = ref<string>('')
 if (props.displayType === 'input') {
   listFileLabel.value = props.fileInfo.showName || ''

package/packages/multipart-upload/src/multipart-upload-form.vue

@@ -132,6 +132,7 @@ import {isImage} from '../../../src/utils/util'
 import {
 	isPlateSys,
 	getSystemFrontendUrl,
+  getKkFilePreviewUrl,
 } from '../../../src/utils/common-util'
 import * as Vue from 'vue'
 import FsPreview from '../../fs-preview/src/fs-preview.vue'
@@ -349,7 +350,10 @@ export default {
 					//要预览文件的访问地址
 					const myPreviewUrl = originUrl + '&fullfilename='+myShowName
 					// http://127.0.0.1:8012/onlinePreview
-					previewUrl = window.$vueApp.config.globalProperties.kkFileViewUrl+'?url='+encodeURIComponent(Base64.encode(myPreviewUrl))
+					getKkFilePreviewUrl(myPreviewUrl).then(url=>{
+						window.open(url, myShowName)
+					})
+					// previewUrl = window.$vueApp.config.globalProperties.kkFileViewUrl+'?url='+encodeURIComponent(Base64.encode(myPreviewUrl))
 				} else {
 					previewUrl =
 					baseUrl +
@@ -360,8 +364,8 @@ export default {
 						encodeURI(myShowName) +
 						'&serverPath=' +
 						uuid
+					window.open(previewUrl, myShowName)
 				}
-				window.open(previewUrl, myShowName)
 			}
 		},
 		deleteRow(index) {

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

@@ -170,6 +170,7 @@ import {isImage} from '../../../src/utils/util'
 import {
 	isPlateSys,
 	getSystemFrontendUrl,
+  getKkFilePreviewUrl,
 } from '../../../src/utils/common-util'
 import * as Vue from 'vue'
 import FsPreview from '../../fs-preview/src/fs-preview.vue'
@@ -502,7 +503,10 @@ export default {
 					//要预览文件的访问地址
 					const myPreviewUrl = originUrl + '&fullfilename='+myShowName
 					// http://127.0.0.1:8012/onlinePreview
-					previewUrl = window.$vueApp.config.globalProperties.kkFileViewUrl+'?url='+encodeURIComponent(Base64.encode(myPreviewUrl))
+					getKkFilePreviewUrl(myPreviewUrl).then(url=>{
+						window.open(url, myShowName)
+					})
+					// previewUrl = window.$vueApp.config.globalProperties.kkFileViewUrl+'?url='+encodeURIComponent(Base64.encode(myPreviewUrl))
 				} else {
 					previewUrl =
 					baseUrl +
@@ -513,8 +517,8 @@ export default {
 						encodeURI(myShowName) +
 						'&serverPath=' +
 						uuid
+					window.open(previewUrl, myShowName)
 				}
-				window.open(previewUrl, myShowName)
 			}
 		},
 		handleOnRemove(index) {

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

@@ -323,7 +323,13 @@ function exportListData(
       // 页面编码
       param['pageCode'] = pageCode
       // 导出按钮是否需要验证权限
-      param['isPermission'] = isPermission
+      param['isPermission'] = isPermission      
+      const isShowWatermark = exportOptions.isShowWatermark===undefined || exportOptions.isShowWatermark===null?'true':exportOptions.isShowWatermark
+      param['isShowWatermark'] = isShowWatermark
+      let watermarkContent = exportOptions.watermarkContent
+      if(watermarkContent){
+        param['watermarkContent'] = watermarkContent
+      }
       let baseUrl = exportOptions ? exportOptions.backendUrl : null
       if(!baseUrl){
         baseUrl = window.$vueApp.config.globalProperties.baseURL
@@ -369,11 +375,18 @@ function exportListData(
             localStorage.setItem(uuid, 'ok')
           } else {
             if (data.indexOf('~~') >= 0) {
+              const isShowWatermark = exportOptions.isShowWatermark===undefined || exportOptions.isShowWatermark===null?'true':exportOptions.isShowWatermark
+              let watermarkContent = exportOptions.watermarkContent
+              if(!watermarkContent){
+                watermarkContent = ''
+              }
               localStorage.setItem(uuid, 'ok')
               return download(
                 window.$vueApp.config.globalProperties.baseAPI +
                   '/component/super-grids/downloads?fileName=' +
                   encodeURI(data) +
+                  '&isShowWatermark='+isShowWatermark+
+                  '&watermark='+encodeURI(watermarkContent) +
                   '&_t=' +
                   new Date().getTime(),
                 excelName

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

@@ -1471,6 +1471,15 @@ const apis = {
       }
     }
     gridParams.gridData[rowIndex]['validateErrorField'] = fieldName
+  },
+  /**
+   * 手动执行自定义查询
+   * @param {Array} searchableColumns 查询字段集合
+   * @param {object} searchData 查询值对象。例如：{'DEPT_CODE':'xxx','DEPT_NAME':'xxxx'}
+   */
+  handleSearch(searchableColumns, searchData){
+    const searchForm = this.packageSearchParamNormalType(searchableColumns, searchData)
+    this.doSearch(searchForm)
   }
 }
 export default apis

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

@@ -861,12 +861,20 @@ export default {
     // 如果是多选文件类型，需要解析（需要设置临时字段，判断文件还是图片，图片需要预览）
     if (this.column.valueSetOptions) {
       if (this.column.componentType === 'switch') {
-        const valueSetOptionsObj = JSON.parse(this.column.valueSetOptions)
+        let valueSetOptionsObj = JSON.parse(this.column.valueSetOptions)
+        if(typeof valueSetOptionsObj === 'string'){
+          // 再转一次
+          valueSetOptionsObj = JSON.parse(valueSetOptionsObj)
+        }
         if (valueSetOptionsObj) {
           this.valueSetOptions = valueSetOptionsObj
         }
       } else if (this.column.componentType !== 'inputNumber') {
-        const valueSetOptionsObj = JSON.parse(this.column.valueSetOptions)
+        let valueSetOptionsObj = JSON.parse(this.column.valueSetOptions)
+        if(typeof valueSetOptionsObj === 'string'){
+          // 再转一次
+          valueSetOptionsObj = JSON.parse(valueSetOptionsObj)
+        }
         if (valueSetOptionsObj && valueSetOptionsObj.valueSetOptions) {
           this.valueSetOptions = valueSetOptionsObj.valueSetOptions
         }
@@ -990,7 +998,11 @@ export default {
      */
     getDateAllowTime() {
       if (this.column.valueSetOptions) {
-        const optionsObj = JSON.parse(this.column.valueSetOptions)
+        let optionsObj = JSON.parse(this.column.valueSetOptions)
+        if(typeof optionsObj === 'string'){
+          // 再转一次
+          optionsObj = JSON.parse(optionsObj)
+        }
         const nowTime = Date.now()
         if (optionsObj.stateForbiddenTime) {
           const stateDayNumber = optionsObj.stateForbiddenTime
@@ -1822,7 +1834,11 @@ export default {
             this.column.valueSetOptions !== '' &&
             this.column.componentType === 'inputNumber'
           ) {
-            const inputNumberSetting = JSON.parse(this.column.valueSetOptions)
+            let inputNumberSetting = JSON.parse(this.column.valueSetOptions)
+            if(typeof inputNumberSetting === 'string'){
+              // 再转一次
+              inputNumberSetting = JSON.parse(inputNumberSetting)
+            }
             if (inputNumberSetting.min) {
               defaultValue = inputNumberSetting.min
             }
@@ -1912,7 +1928,11 @@ export default {
           this.column.valueSetOptions !== '' &&
           this.column.componentType === 'inputNumber'
         ) {
-          const inputNumberSetting = JSON.parse(this.column.valueSetOptions)
+          let inputNumberSetting = JSON.parse(this.column.valueSetOptions)
+          if(typeof inputNumberSetting === 'string'){
+            // 再转一次
+            inputNumberSetting = JSON.parse(inputNumberSetting)
+          }
           this.inputNumberSet = inputNumberSetting
         } else {
           this.inputNumberSet = {