agilebuilder-ui 1.1.53-rc2 → 1.1.53-rc3

package/lib/{tab-content-iframe-index-ce7ae1b1.js → tab-content-iframe-index-9ad40367.js}

@@ -1,5 +1,5 @@
 import { openBlock as r, createElementBlock as t, createCommentVNode as o } from "vue";
-import { _ as s } from "./index-4de24459.js";
+import { _ as s } from "./index-2b362c08.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-e3f55e4f.js → tab-content-index-8faba618.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-4de24459.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-2b362c08.js";
 import { resolveComponent as u, openBlock as d, createBlock as b, withCtx as g, createVNode as v, TransitionGroup as L, createElementBlock as p, Fragment as T, renderList as C, 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-0e455ec8.js → tache-subprocess-history-098fc139.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-4de24459.js";
+import { _ as I } from "./index-2b362c08.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.53-rc2",
+  "version": "1.1.53-rc3",
   "type": "module",
   "private": false,
   "main": "./lib/super-ui.js",

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

@@ -332,9 +332,12 @@ export default {
       const watermark = await getWatermarkSetting()
       let isShowWatermark = false
       if(watermark && watermark.useRange && watermark.useRange.indexOf('annex')>=0){
-        isShowWatermark = this.watermark.isShowWatermark
+        isShowWatermark = this.watermark.isShowWatermark===undefined?true:this.watermark.isShowWatermark
       }
       let watermarkContent = this.watermark?.content
+      if (!watermarkContent && watermark) {
+        watermarkContent = watermark.content
+      }
       if (!watermarkContent) {
         watermarkContent = ''
       }

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

@@ -332,6 +332,12 @@ function exportListData(
       }
       param['isShowWatermark'] = isShowWatermark
       let watermarkContent = exportOptions.watermarkContent
+      if (!watermarkContent && watermark) {
+        watermarkContent = watermark.content
+      }
+      if (!watermarkContent) {
+        watermarkContent = ''
+      }
       if(watermarkContent){
         param['watermarkContent'] = watermarkContent
       }
@@ -386,7 +392,10 @@ function exportListData(
                 isShowWatermark = exportOptions.isShowWatermark===undefined || exportOptions.isShowWatermark===null?'true':exportOptions.isShowWatermark
               }
               let watermarkContent = exportOptions.watermarkContent
-              if(!watermarkContent){
+              if (!watermarkContent && watermark) {
+                watermarkContent = watermark.content
+              }
+              if (!watermarkContent) {
                 watermarkContent = ''
               }
               localStorage.setItem(uuid, 'ok')