agilebuilder-ui 1.1.53-rc1 → 1.1.53-rc2

package/lib/{tab-content-iframe-index-0007a8e7.js → tab-content-iframe-index-ce7ae1b1.js}

@@ -1,5 +1,5 @@
 import { openBlock as r, createElementBlock as t, createCommentVNode as o } from "vue";
-import { _ as s } from "./index-05ede327.js";
+import { _ as s } from "./index-4de24459.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-b9cb98bf.js → tab-content-index-e3f55e4f.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-05ede327.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-4de24459.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-7f9f692c.js → tache-subprocess-history-0e455ec8.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-05ede327.js";
+import { _ as I } from "./index-4de24459.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-rc1",
+  "version": "1.1.53-rc2",
   "type": "module",
   "private": false,
   "main": "./lib/super-ui.js",

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

@@ -94,6 +94,7 @@ import { isImage, getEntityFieldValue, getI18n } from '../../../src/utils/util'
 import { packageFile } from '../../super-grid/src/utils'
 import { getToken } from '../../../src/utils/auth'
 import { getFileIconByName } from '../../../src/utils/file-util'
+import { getWatermarkSetting } from '../../../src/utils/watermark'
 export default {
   components: {
     ElIconPaperclip,
@@ -326,9 +327,13 @@ export default {
         window.open(src)
       }
     },
-    download(showName, serverPath) {
+    async download(showName, serverPath) {
       const token = getToken()
-      const isShowWatermark = this.watermark.isShowWatermark
+      const watermark = await getWatermarkSetting()
+      let isShowWatermark = false
+      if(watermark && watermark.useRange && watermark.useRange.indexOf('annex')>=0){
+        isShowWatermark = this.watermark.isShowWatermark
+      }
       let watermarkContent = this.watermark?.content
       if (!watermarkContent) {
         watermarkContent = ''

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

@@ -75,6 +75,7 @@ import { isImage } from '../../../src/utils/util'
 import { Base64 } from 'js-base64'
 import { getFileIconByName } from '../../../src/utils/file-util'
 import { useI18n } from 'vue-i18n'
+import { getWatermarkSetting } from '../../../src/utils/watermark'
 const { t } = useI18n()
 const props = defineProps({
   systemCode: {
@@ -152,6 +153,10 @@ const previewImageInfo = ref<any>({})
 const previewSrcList = ref<string[]>([])
 const isMobile = ref(isMobileBrowser())
 const emits = defineEmits(['remove'])
+let watermarkCache = null
+getWatermarkSetting().then((data)=>{
+  watermarkCache = data
+})
 const handleDownload = (file: any) => {
   if (isPromise(props.beforeDownload)) {
     props.beforeDownload(props.pageContext, props.configure, file).then((res: any) => {
@@ -173,7 +178,10 @@ 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 isShowWatermark = false
+  if(watermarkCache && watermarkCache.useRange && watermarkCache.useRange.indexOf('annex')>=0){
+    isShowWatermark = props.watermark?.isShowWatermark
+  }
   let watermarkContent = props.watermark?.content
   if (!watermarkContent) {
     watermarkContent = ''
@@ -296,9 +304,25 @@ const previweDoc = (showName: string, serverPath: string) => {
 function getPreviewSrc(showName: string, serverPath: string) {
   showName = formatName(showName)
   const token = getToken()
-  let url = baseURL + '/common/super-form/downloads?jwt=' + token
+  let isShowWatermark = false
+  if(watermarkCache && watermarkCache.useRange && watermarkCache.useRange.indexOf('annex')>=0){
+    isShowWatermark = props.watermark?.isShowWatermark
+  }
+  let watermarkContent = props.watermark?.content
+  if (!watermarkContent) {
+    watermarkContent = ''
+  }
+  let url = baseURL + '/common/super-form/downloads?jwt=' + token+
+    '&isShowWatermark=' +
+    isShowWatermark +
+    '&watermark=' +
+    encodeURI(watermarkContent)
   if (isPlateSys(props.systemCode)) {
-    url = baseAPI + '/component/super-form/downloads?jwt=' + token
+    url = baseAPI + '/component/super-form/downloads?jwt=' + token+
+    '&isShowWatermark=' +
+    isShowWatermark +
+    '&watermark=' +
+    encodeURI(watermarkContent)
   }
   url = getReplaceUrlDomain(url)
   return url + '&showName=' + encodeURI(showName) + '&serverPath=' + serverPath

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

@@ -5,6 +5,7 @@ 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'
+import { getWatermarkSetting } from '../../src/utils/watermark'
 
 /**
  *
@@ -280,7 +281,7 @@ function exportListData(
   isPermission,
   exportOptions
 ) {
-  return new Promise((resolve, reject) => {
+  return new Promise(async (resolve, reject) => {
     const gridParams = getGridParams(listCode)
     if (gridParams === undefined || gridParams === null) {
       reject('导出失败')
@@ -323,8 +324,12 @@ function exportListData(
       // 页面编码
       param['pageCode'] = pageCode
       // 导出按钮是否需要验证权限
-      param['isPermission'] = isPermission      
-      const isShowWatermark = exportOptions.isShowWatermark===undefined || exportOptions.isShowWatermark===null?'true':exportOptions.isShowWatermark
+      param['isPermission'] = isPermission
+      let isShowWatermark = false
+      const watermark = await getWatermarkSetting()
+      if(watermark && watermark.useRange && watermark.useRange.indexOf('annex')>=0){
+        isShowWatermark = exportOptions.isShowWatermark===undefined || exportOptions.isShowWatermark===null?'true':exportOptions.isShowWatermark
+      }
       param['isShowWatermark'] = isShowWatermark
       let watermarkContent = exportOptions.watermarkContent
       if(watermarkContent){
@@ -341,7 +346,7 @@ function exportListData(
             '/dsc/commons/export-list-data',
           param
         )
-        .then((data) => {
+        .then(async (data) => {
           if(exportOptions.pageContext) {
             exportOptions.pageContext.canClick = true
           }
@@ -375,7 +380,11 @@ function exportListData(
             localStorage.setItem(uuid, 'ok')
           } else {
             if (data.indexOf('~~') >= 0) {
-              const isShowWatermark = exportOptions.isShowWatermark===undefined || exportOptions.isShowWatermark===null?'true':exportOptions.isShowWatermark
+              let isShowWatermark = false
+              const watermark = await getWatermarkSetting()
+              if(watermark && watermark.useRange && watermark.useRange.indexOf('annex')>=0){
+                isShowWatermark = exportOptions.isShowWatermark===undefined || exportOptions.isShowWatermark===null?'true':exportOptions.isShowWatermark
+              }
               let watermarkContent = exportOptions.watermarkContent
               if(!watermarkContent){
                 watermarkContent = ''

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

@@ -263,9 +263,18 @@ const apis = {
               // 子表集合添加该新建的行。会触发watch subTableData的监控
               gridParams.isChangePage = true
               if (addRowIndex >= 0) {
-                gridParams.subTableData.splice(addRowIndex, 0, row)
+                const lastPageRowIndex = (this.currentPage - 1) * this.pageSize
+                const subTableRowIndex = lastPageRowIndex + addRowIndex
+                gridParams.addRowIndex = subTableRowIndex + 1
+
+                gridParams.subTableData.splice(subTableRowIndex, 0, row)
               } else {
-                gridParams.subTableData.splice(gridParams.subTableData.length, 0, row)
+                let lastIndex = gridParams.subTableData.length
+                if(lastIndex <= 0){
+                  lastIndex = -1
+                }
+                gridParams.subTableData.splice(lastIndex, 0, row)
+                gridParams.addRowIndex = gridParams.subTableData.length
               }
             } else {
               // 子表不分页
@@ -1051,7 +1060,7 @@ const apis = {
       if (canDelete === undefined || canDelete === true) {
         if (gridParams.isSubTableShowPage !== undefined && gridParams.isSubTableShowPage === true) {
           // 子表集合添加该新建的行。会触发watch subTableData的监控
-          gridParams.isChangePage = true
+          gridParams.isDelete = true
           const lastPageRowIndex = (this.currentPage - 1) * this.pageSize
           const subTableRowIndex = lastPageRowIndex + rowIndex
 
@@ -1189,7 +1198,7 @@ const apis = {
         const deleteIndexs = []
         if (gridParams.isSubTableShowPage !== undefined && gridParams.isSubTableShowPage === true) {
           // 子表集合添加该新建的行。会触发watch subTableData的监控
-          gridParams.isChangePage = true
+          gridParams.isDelete = true
           const indexes = this.getDeleteIndexes(gridParams.subTableData, deleteRows, rowKey)
           for (const idx of indexes) {
             gridParams.subTableData.splice(idx, 1)

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

@@ -203,7 +203,6 @@ import {
   getExtraParam,
   getFirstEditableColumn,
   getGridParams,
-  getLastPageNum,
   getSpanValuesForColumn,
   getTableHeight,
   isCanRefreshGrid,
@@ -211,7 +210,8 @@ import {
   isHasEditOption,
   isHasOptionFunction,
   isObjectValueEqual,
-  rowBeforeValidate
+  rowBeforeValidate,
+  getRowIndexPage
 } from './utils'
 import Sortable from 'sortablejs'
 import store from './store'
@@ -662,7 +662,6 @@ export default {
     // 监控列表数据修改，列表作为表单编辑器中子表时使用
     gridData: {
       deep: true,
-      immediate: true,
       handler: function (Val) {
         if (!this.isSubTableShowPage) {
           // 列表子表不分页时使用
@@ -679,14 +678,13 @@ export default {
           // 列表子表分页时使用
           const gridParams = store.get(this.code)
           $emit(this, 'change-grid-data', this.subTableData)
-          if (gridParams.isChangePage !== undefined && gridParams.isChangePage) {
-            // 表示新建记录时
-            // 新建记录时跳转到最后一页
-            const lastPageNum = getLastPageNum(this.subTableData.length, this.pageSize)
+          if ((gridParams.isChangePage !== undefined && gridParams.isChangePage) || (gridParams.isDelete !== undefined && gridParams.isDelete)) {
+            // 表示新建记录 或 删除记录时
             // 表示最后一页页码和当前页不同时需要切换页码
-            if (lastPageNum !== this.currentPage) {
-              // 切换当前页码为最后一页
-              this.currentPage = lastPageNum
+            if (gridParams.isChangePage !== undefined && gridParams.isChangePage) {
+              // 新建记录 切换到新增记录所属的页码
+              const rowPage = getRowIndexPage(this.pageSize, gridParams.addRowIndex)
+              this.currentPage = rowPage
               // 切换当前页码到最后一页的数据
               this.changePage()
             } else {
@@ -700,12 +698,16 @@ export default {
             }
             // 使用完状态还原
             gridParams.isChangePage = false
+            gridParams.isDelete = false
           } else {
             // 表示不是子表新建记录
             this.gridData = this.getSubTableGridData(this.subTableData)
             gridParams.gridData = this.gridData
             // 完成深拷贝，复制一份对象，行编辑时使用
             gridParams.orgGridData = [].concat(JSON.parse(JSON.stringify(this.gridData)))
+            // 使用完状态还原
+            gridParams.isChangePage = false
+            gridParams.isDelete = false
           }
         }
       }

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

@@ -801,6 +801,17 @@ export function getLastPageNum(total, rowsPerPage) {
     return Math.ceil(total / rowsPerPage)
   }
 }
+
+// 获得指定记录索引所属的页码
+export function getRowIndexPage(rowsPerPage, addRowIndex) {
+  if (rowsPerPage === undefined || rowsPerPage === null || rowsPerPage === 0) {
+    return 1
+  }  else if (addRowIndex === undefined || addRowIndex === null || addRowIndex === 0) {
+    return 1
+  } else {
+    return Math.ceil(addRowIndex / rowsPerPage)
+  }
+}
 // 纵向滚动条滚动最底部功能
 export function scrollYToBottom(listCode) {
   const scrollDivElement = document.querySelector('.' + listCode + ' .el-table--scrollable-y .el-table__body-wrapper')

package/src/utils/common-util.js

@@ -826,7 +826,8 @@ export function getKkFilePreviewUrl(previewUrl) {
   let myPreviewUrl = getKkFileBackendUrl()+'?url='+encodeURIComponent(Base64.encode(previewUrl))
   return new Promise((resolve,reject)=>{
     getWatermarkSetting().then((watermark)=>{
-      if(watermark){
+      if(watermark && watermark.useRange && watermark.useRange.indexOf('annex')>=0){
+        // 表示适用范围有附件时
         myPreviewUrl = myPreviewUrl + '&watermarkTxt='+watermark.content+'&watermarkXSpace=60&watermarkYSpace=100&watermarkWidth=500&watermarkHeight=100'
       }
       resolve(myPreviewUrl)

package/src/utils/watermark.js

@@ -107,14 +107,12 @@ export function getWatermarkSetting(){
 // 该方法只允许调用一次
 export function showWatermarkNew() {
   getWatermarkSetting().then((watermark)=>{
-    if(watermark){
+    if(watermark && watermark.useRange && watermark.useRange.indexOf('page')>=0){
+      // 表示影响范围有页面，则页面显示水印
       setWatermark(watermark.content, watermark)
     }
   })
 }
-// watermark.set = (label, parma) => {
-
-// }
 
 const formatDate = (date, fmt) => {
   if (/(y+)/.test(fmt)) {