agilebuilder-ui 1.1.47 → 1.1.48

package/lib/{tab-content-iframe-index-4c557db3.js → tab-content-iframe-index-0a36be80.js}

@@ -1,5 +1,5 @@
 import { openBlock as r, createElementBlock as t, createCommentVNode as o } from "vue";
-import { _ as s } from "./index-f3ef09a5.js";
+import { _ as s } from "./index-5c1112e8.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-a7350229.js → tab-content-index-9a271908.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-f3ef09a5.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-5c1112e8.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-f19dd95f.js → tache-subprocess-history-93d013b2.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-f3ef09a5.js";
+import { _ as I } from "./index-5c1112e8.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.47",
+  "version": "1.1.48",
   "type": "module",
   "private": false,
   "main": "./lib/super-ui.js",

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

@@ -11,6 +11,7 @@
         </span>
       </template>
       <div v-if="firstFileName" ref="toolRef" class="fs-preview-tool">
+        <slot name="tool-prefix" :item="getFirstFile()"></slot>
         <el-tooltip v-if="enableDelete && !disabled" :content="$t('fsUpload.delete')">
           <super-icon @click="deleteFirst()" iconValue="amb-color-icon-shanchu" />
         </el-tooltip>
@@ -20,11 +21,12 @@
         <el-tooltip v-if="!disabled || !fileSetObj.disabledNoDownload" :content="$t('fsUpload.download')">
           <super-icon @click="downloadFirst()" iconValue="amb-color-icon-xiazai" />
         </el-tooltip>
+        <slot name="tool-suffix" :item="getFirstFile()"></slot>
         <el-divider v-if="showMultipleFile" direction="vertical" />
         <el-popover :width="450" trigger="click">
           <template #reference>
             <el-button v-if="showMultipleFile" type="primary" round size="small" @click="showMultiView">
-              更多
+              {{ $t('fsUpload.more') }}
               <el-icon><ArrowDownBold /></el-icon>
             </el-button>
           </template>
@@ -53,6 +55,7 @@
                 <el-link type="primary" v-if="!disabled || !fileSetObj.disabledNoDownload" underline>
                   {{ $t('fsUpload.download') }}
                 </el-link> -->
+                <slot name="tool-more-prefix" :item="item"></slot>
                 <el-tooltip v-if="enableDelete" :content="$t('fsUpload.delete')">
                   <super-icon @click="deleteFile(item)" iconValue="amb-color-icon-shanchu" />
                 </el-tooltip>
@@ -375,6 +378,7 @@ export default {
           })
         }
       }
+      return this.fileList
     },
     deleteFirst() {
       const fileInfo = this.getFirstFile()

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"
             >
@@ -310,9 +311,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 { ref, defineProps, defineEmits } from 'vue'
 import { 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: {
@@ -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 { ref, defineProps, defineEmits } from 'vue'
 import { 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: {
@@ -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-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/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 })
+}

package/packages/super-grid/src/normal-column-content.vue

@@ -147,7 +147,7 @@
           columnFormatter.options.format &&
           columnFormatter.options.format !== ''
         "
-        :class="isShowForm ? '' : 'cell--span'"
+        :class="textOverflow === 'newline' ? 'wrap-text' : 'ellipsis cell--span'"
       >
         <!--:key="column.prop+'_'+rowIndex+'_'+currentPage" 为了解决子表分页时，新增自动跳转到下一页，第一条记录的自定义控件被复用，导致业务逻辑没执行 -->
         <component
@@ -172,7 +172,7 @@
           :component-id="componentId"
           :additional-settings="additionalSettings"
           :page-context="options?.pageContext"
-          :custom-params="controlConfig ? controlConfig.customParams : null"
+          :custom-params="getCustomParams()"
           @prohibitToEdit="prohibitToEdit"
           @refresh-list="refreshList"
       /></span>
@@ -221,12 +221,7 @@
             @click="clickHyperLink(column, row, listCode, rowIndex)"
         > -->
         <el-link
-          v-else-if="
-            columnFormatter !== undefined &&
-            columnFormatter.type !== undefined &&
-            columnFormatter.type === 'hyperlinks' &&
-            getMyHyperLinkSetting(row, rowIndex).visible === true
-          "
+          v-else-if="columnFormatter?.type === 'hyperlinks' && linkObject.visible === true"
           :type="getLinkType(row)"
           @click="clickHyperLink(column, row, listCode, rowIndex)"
         >
@@ -234,20 +229,14 @@
             v-if="isShowOverflowTooltip"
             :id="column.prop + 'DomData' + rowIndex"
             :style="textOverflow === 'newline' ? {} : { width: cellWidth + 'px' }"
-            :title="getMyHyperLinkSetting(row, rowIndex).title"
+            :title="linkObject.title"
             :class="textOverflow === 'newline' ? 'wrap-text' : 'ellipsis cell--span'"
-            >{{ getMyHyperLinkSetting(row, rowIndex).label }}
-            <SuperIcon
-              v-if="getMyHyperLinkSetting(row, rowIndex).icon"
-              :iconValue="getMyHyperLinkSetting(row, rowIndex).icon"
-            ></SuperIcon>
+            >{{ linkObject.label }}
+            <SuperIcon v-if="linkObject.icon" :iconValue="linkObject.icon"></SuperIcon>
           </span>
           <span v-else :id="column.prop + 'DomData' + rowIndex" :class="isShowForm ? '' : 'cell--span'"
-            >{{ getMyHyperLinkSetting(row, rowIndex).label }}
-            <SuperIcon
-              v-if="getMyHyperLinkSetting(row, rowIndex).icon"
-              :iconValue="getMyHyperLinkSetting(row, rowIndex).icon"
-            ></SuperIcon>
+            >{{ linkObject.label }}
+            <SuperIcon v-if="linkObject.icon" :iconValue="linkObject.icon"></SuperIcon>
           </span>
         </el-link>
         <span
@@ -307,12 +296,7 @@
         </span>
         <!-- 超链接 -->
         <el-link
-          v-else-if="
-            columnFormatter !== undefined &&
-            columnFormatter.type !== undefined &&
-            columnFormatter.type === 'hyperlinks' &&
-            getMyHyperLinkSetting(row, rowIndex).visible === true
-          "
+          v-else-if="columnFormatter?.type === 'hyperlinks' && linkObject.visible"
           type="primary"
           @click="clickHyperLink(column, row, listCode, rowIndex)"
         >
@@ -320,20 +304,14 @@
             v-if="isShowOverflowTooltip"
             :id="column.prop + 'DomData' + rowIndex"
             :style="textOverflow === 'newline' ? {} : { width: cellWidth + 'px' }"
-            :title="$escapeHtml(getMyHyperLinkSetting(row, rowIndex).title)"
+            :title="$escapeHtml(linkObject.title)"
             :class="textOverflow === 'newline' ? 'wrap-text' : 'ellipsis cell--span'"
-            >{{ $escapeHtml(getMyHyperLinkSetting(row, rowIndex).label) }}
-            <SuperIcon
-              v-if="getMyHyperLinkSetting(row, rowIndex).icon"
-              :iconValue="getMyHyperLinkSetting(row, rowIndex).icon"
-            ></SuperIcon>
+            >{{ $escapeHtml(linkObject.label) }}
+            <SuperIcon v-if="linkObject.icon" :iconValue="linkObject.icon"></SuperIcon>
           </span>
           <span v-else :id="column.prop + 'DomData' + rowIndex" :class="isShowForm ? '' : 'cell--span'"
-            >{{ $escapeHtml(getMyHyperLinkSetting(row, rowIndex).label) }}
-            <SuperIcon
-              v-if="getMyHyperLinkSetting(row, rowIndex).icon"
-              :iconValue="getMyHyperLinkSetting(row, rowIndex).icon"
-            ></SuperIcon>
+            >{{ $escapeHtml(linkObject.label) }}
+            <SuperIcon v-if="linkObject.icon" :iconValue="linkObject.icon"></SuperIcon>
           </span>
         </el-link>
         <!-- 富文本 -->
@@ -554,7 +532,8 @@ export default {
       requiredClass: '',
       lineEdit,
       options,
-      textOverflow
+      textOverflow,
+      linkObject: {}
     }
   },
   computed: {
@@ -707,6 +686,9 @@ export default {
     }
     this.setScanRuleSets()
     this.requiredClass = this.isRequired(this.row.$editing) ? 'm-requried column-text-main' : ''
+    if (this.columnFormatter?.type === 'hyperlinks') {
+      this.linkObject = this.getMyHyperLinkSetting(this.row, this.rowIndex)
+    }
   },
   mounted() {
     if (this.controlConfig) {
@@ -1280,6 +1262,16 @@ export default {
         }
       }
       return true
+    },
+    getCustomParams() {
+      if (this.column.formatter.type === 'customControl') {
+        if (this.column.formatter?.options?.controlConfig) {
+          const controlConfig = JSON.parse(this.column.formatter.options.controlConfig)
+          if (controlConfig && controlConfig.customParams) {
+            return formatCustomParams(controlConfig.customParams, this.options?.pageContext, this.row)
+          }
+        }
+      }
     }
   },
   emits: ['refresData', 'refresPortData', 'refresPortsData', 'refresMainTableFields', 'prohibitToEdit']

package/src/i18n/langs/cn.js

@@ -284,7 +284,9 @@ const cn = {
     theNumberOfUploadsExceedsTheLimitTheLimitIs: '上传数量超过限制,限制数量为',
     image: '图片',
     video: '视频',
-    updateSuccess: '更新成功'
+    updateSuccess: '更新成功',
+    more: '更多',
+    uploadFailed: '上传失败！'
   },
   messageVideo: {
     attemptingToIdentify: '正在尝试识别....',

package/src/i18n/langs/en.js

@@ -283,7 +283,9 @@ const en = {
     theNumberOfUploadsExceedsTheLimitTheLimitIs: 'The number of uploads exceeds the limit. The limit is',
     image: 'Image',
     video: 'Video',
-    updateSuccess: 'Update success'
+    updateSuccess: 'Update success',
+    more: 'More',
+    uploadFailed: 'Upload failed!'
   },
   messageVideo: {
     attemptingToIdentify: 'Attempting to identify',

package/src/utils/jump-page-utils.js

@@ -73,6 +73,7 @@ export function initialization(
           if (jumpPageResult && jumpPageResult.visible) {
             const res = { ...jumpPageResult }
             res.jumpPageSetting = JSON.stringify(jumpPageItem.jumpPageSetting)
+            res.jumpPageItem = jumpPageItem
             return res
           }
         }
@@ -228,7 +229,10 @@ export function jumpToPage(
     }
     getSystem(system, jumpPageSetting.jumpPageUrl, jumpPageSetting.isNewPage, jumpPageSetting)
       .then((system) => {
-        if ((jumpPageSetting.jumpPageAdditional && jumpPageSetting.jumpPageAdditional.length > 0) || (jumpPageSetting.jumpPageTitle && jumpPageSetting.jumpPageTitle.indexOf('${')>=0)) {
+        if (
+          (jumpPageSetting.jumpPageAdditional && jumpPageSetting.jumpPageAdditional.length > 0) ||
+          (jumpPageSetting.jumpPageTitle && jumpPageSetting.jumpPageTitle.indexOf('${') >= 0)
+        ) {
           // 发送请求，获取附加参数，并存入缓存
           const paramPath =
             window.$vueApp.config.globalProperties.baseAPI + '/component/super-pages/parsing-additional-parameters'
@@ -242,7 +246,7 @@ export function jumpToPage(
           if (!pageData) {
             pageData = {}
           }
-          if(!additionalParamMap){
+          if (!additionalParamMap) {
             additionalParamMap = {}
           }
           Object.assign(additionalParamMap, pageData)
@@ -593,11 +597,11 @@ function jumpWithSuperPage(jumpPageUrl, system, dataId, jumpPageSetting, ids, bu
       // 移动端时，获得移动端打开方式
       jumpMode = jumpPageSetting.jumpPageMobileOpenMode
     }
-    if(!jumpMode && jumpPageSetting) {
+    if (!jumpMode && jumpPageSetting) {
       // 移动端没有配置则以 打开方式为准
       jumpMode = jumpPageSetting.jumpPageOpenMode
     }
-    if(!jumpMode){
+    if (!jumpMode) {
       // 默认是刷新页面
       jumpMode = 'refresh'
     }