agilebuilder-ui 1.1.41 → 1.1.42

package/lib/{tab-content-iframe-index-094835e7.js → tab-content-iframe-index-16207fb9.js}

@@ -1,5 +1,5 @@
 import { openBlock as r, createElementBlock as t, createCommentVNode as o } from "vue";
-import { _ as s } from "./index-a36c91b2.js";
+import { _ as s } from "./index-50fdf8ae.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-92b24462.js → tab-content-index-8ae8c396.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-a36c91b2.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-50fdf8ae.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-0d32337a.js → tache-subprocess-history-110e29f2.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-a36c91b2.js";
+import { _ as I } from "./index-50fdf8ae.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.41",
+  "version": "1.1.42",
   "type": "module",
   "private": false,
   "main": "./lib/super-ui.js",

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

@@ -11,25 +11,15 @@
         </span>
       </template>
       <div v-if="firstFileName" ref="toolRef" class="fs-preview-tool">
-        <el-link v-if="enableDelete && !disabled" type="danger" :underline="false" @click="deleteFirst()">
-          {{ $t('fsUpload.delete') }}
-        </el-link>
-        <el-link
-          v-if="!disabled || !fileSetObj.disabledNoPreview"
-          type="primary"
-          :underline="false"
-          @click="previewFirst()"
-        >
-          {{ $t('fsUpload.preview') }}
-        </el-link>
-        <el-link
-          v-if="!disabled || !fileSetObj.disabledNoDownload"
-          type="primary"
-          :underline="false"
-          @click="downloadFirst()"
-        >
-          {{ $t('fsUpload.download') }}
-        </el-link>
+        <el-tooltip v-if="enableDelete && !disabled" :content="$t('fsUpload.delete')">
+          <super-icon @click="deleteFirst()" iconValue="amb-color-icon-shanchu" />
+        </el-tooltip>
+        <el-tooltip v-if="!disabled || !fileSetObj.disabledNoPreview" :content="$t('fsUpload.preview')">
+          <super-icon @click="previewFirst()" iconValue="amb-color-icon-yulan" />
+        </el-tooltip>
+        <el-tooltip v-if="!disabled || !fileSetObj.disabledNoDownload" :content="$t('fsUpload.download')">
+          <super-icon @click="downloadFirst()" iconValue="amb-color-icon-xiazai" />
+        </el-tooltip>
         <el-divider v-if="showMultipleFile" direction="vertical" />
         <el-popover :width="450" trigger="click">
           <template #reference>
@@ -41,7 +31,7 @@
           <div style="max-height: 300px; overflow-y: auto">
             <div v-for="(item, index) in fileList" :ref="item.serverPath" :key="item.serverPath" class="file-item">
               <div style="display: flex; align-items: center; flex: 1">
-                <span>
+                <span class="more-file-icon">
                   <super-icon :iconValue="getFileIconByName(item.showName)" />
                 </span>
                 <span class="amb-list-preivew-name" style="width: 230px; margin-left: 10px">
@@ -49,7 +39,7 @@
                 </span>
               </div>
               <div class="file-actions">
-                <el-link v-if="enableDelete" type="danger" underline @click="deleteFile(item)">
+                <!-- <el-link v-if="enableDelete" type="danger" underline @click="deleteFile(item)">
                   {{ $t('fsUpload.delete') }}
                 </el-link>
                 <el-link
@@ -60,14 +50,18 @@
                 >
                   {{ $t('fsUpload.preview') }}
                 </el-link>
-                <el-link
-                  type="primary"
-                  v-if="!disabled || !fileSetObj.disabledNoDownload"
-                  underline
-                  @click="donwloadFile(index)"
-                >
+                <el-link type="primary" v-if="!disabled || !fileSetObj.disabledNoDownload" underline>
                   {{ $t('fsUpload.download') }}
-                </el-link>
+                </el-link> -->
+                <el-tooltip v-if="enableDelete" :content="$t('fsUpload.delete')">
+                  <super-icon @click="deleteFile(item)" iconValue="amb-color-icon-shanchu" />
+                </el-tooltip>
+                <el-tooltip v-if="!disabled || !fileSetObj.disabledNoPreview" :content="$t('fsUpload.preview')">
+                  <super-icon @click="previewSingle(item)" iconValue="amb-color-icon-yulan" />
+                </el-tooltip>
+                <el-tooltip v-if="!disabled || !fileSetObj.disabledNoDownload" :content="$t('fsUpload.download')">
+                  <super-icon @click="donwloadFile(index)" iconValue="amb-color-icon-xiazai" />
+                </el-tooltip>
               </div>
             </div>
           </div>
@@ -413,10 +407,22 @@ export default {
   min-width: max-content;
   margin-left: auto; /* 添加这行，将工具栏推到右侧 */
 }
-.amb-color-iconfont {
+
+.fs-preview-container :deep(.amb-color-iconfont),
+.more-file-icon :deep(.amb-color-iconfont) {
   width: 30px;
   height: 30px;
 }
+.fs-preview-tool :deep(.amb-color-iconfont),
+.file-actions :deep(.amb-color-iconfont) {
+  font-size: 15px !important; /* 图标实际大小，按需改 */
+  display: inline-block;
+  width: 1em !important; /* 覆盖子组件 .super-icon 的 14px */
+  height: 1em !important;
+  line-height: 1em;
+  cursor: pointer;
+}
+
 .amb-list-preivew-name {
   overflow: hidden;
   text-overflow: ellipsis;
@@ -450,4 +456,7 @@ export default {
   gap: 5px;
   flex-shrink: 0; /* 防止按钮被压缩 */
 }
+.super-icon + .super-icon {
+  margin-left: 5px;
+}
 </style>

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

@@ -46,6 +46,8 @@ 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 { t } = useI18n()
 const props = defineProps({
   openFsUpload: {
     type: Boolean,
@@ -129,12 +131,18 @@ const props = defineProps({
   disabledNoDownload: {
     type: Boolean,
     default: false
+  },
+  // limit
+  limit: {
+    type: Number,
+    default: 0
   }
 })
 const baseURL = window.$vueApp.config.globalProperties.baseURL
 const baseAPI = window.$vueApp.config.globalProperties.baseAPI
 const defaultAction = ref<string>('')
 const buttonUploadRef = ref()
+const innerLimitFileSize = ref(props.limitFileSize)
 if (props.action) {
   defaultAction.value = props.action
 } else {
@@ -149,6 +157,31 @@ if (!props.headers || !props.headers['Authorization']) {
   props.headers.Authorization = getToken()
 }
 const handleBeforeUpload = (file: File) => {
+  if (props.fileList?.length !== 0 && props.limit > 0 && props.fileList.length >= props.limit) {
+    ElMessage({
+      type: 'warning',
+      message: t('fsUpload.theNumberOfUploadsExceedsTheLimitTheLimitIs') + ': ' + props.limit,
+      showClose: true
+    })
+    return false
+  }
+  if (!innerLimitFileSize.value) {
+    // 默认是30M
+    innerLimitFileSize.value = 30
+  }
+  if (file.size > innerLimitFileSize.value * 1024 * 1024) {
+    // 超过最大限制
+    ElMessage({
+      type: 'warning',
+      message: t('imatrixUIMessage.exceedFileSize', {
+        fileSize: innerLimitFileSize.value
+      }),
+      showClose: true
+    })
+    // 返回false停止上传
+    return false
+  }
+
   const isMobile = false
   return props.beforeUpload({
     fileObj: file,
@@ -159,7 +192,7 @@ const handleBeforeUpload = (file: File) => {
   })
 }
 const onSuccess = (response: any, uploadFile: UploadFile, uploadFiles: UploadFiles) => {
-  ElMessage.success('上传成功')
+  ElMessage.success(t('fsUpload.uploadSucceeded'))
   // eslint-disable-next-line vue/no-mutating-props
   props.fileList.push({
     showName: response.name,

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

@@ -9,6 +9,7 @@
     :headers="headers"
     :action="defaultAction"
     :multiple="multiple"
+    :before-upload="handleBeforeUpload"
     :on-success="onUploadSuccess"
     :before-remove="beforeRemove"
   >
@@ -43,6 +44,8 @@ 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 { t } = useI18n()
 const props = defineProps({
   openFsUpload: {
     type: Boolean,
@@ -126,11 +129,17 @@ const props = defineProps({
   disabledNoDownload: {
     type: Boolean,
     default: false
+  },
+  // limit
+  limit: {
+    type: Number,
+    default: 0
   }
 })
 const baseURL = window.$vueApp.config.globalProperties.baseURL
 const baseAPI = window.$vueApp.config.globalProperties.baseAPI
 const defaultAction = ref<string>('')
+const innerLimitFileSize = ref(props.limitFileSize)
 if (props.action) {
   defaultAction.value = props.action
 } else {
@@ -145,10 +154,42 @@ if (!props.headers || !props.headers['Authorization']) {
   props.headers.Authorization = getToken()
 }
 const handleBeforeUpload = (file: File) => {
-  return props.beforeUpload(file)
+  if (props.fileList?.length !== 0 && props.limit > 0 && props.fileList.length >= props.limit) {
+    ElMessage({
+      type: 'warning',
+      message: t('fsUpload.theNumberOfUploadsExceedsTheLimitTheLimitIs') + ': ' + props.limit,
+      showClose: true
+    })
+    return false
+  }
+  if (!innerLimitFileSize.value) {
+    // 默认是30M
+    innerLimitFileSize.value = 30
+  }
+  if (file.size > innerLimitFileSize.value * 1024 * 1024) {
+    // 超过最大限制
+    ElMessage({
+      type: 'warning',
+      message: t('imatrixUIMessage.exceedFileSize', {
+        fileSize: innerLimitFileSize.value
+      }),
+      showClose: true
+    })
+    // 返回false停止上传
+    return false
+  }
+
+  const isMobile = false
+  return props.beforeUpload({
+    fileObj: file,
+    files: [file],
+    isMobile,
+    pageContext: props.pageContext,
+    configureObj: props.configure
+  })
 }
 const onUploadSuccess = (response: any, uploadFile: UploadFile, uploadFiles: UploadFiles) => {
-  ElMessage.success('上传成功')
+  ElMessage.success(t('fsUpload.uploadSucceeded'))
   // eslint-disable-next-line vue/no-mutating-props
   props.fileList.push({
     showName: response.name,

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

@@ -13,18 +13,18 @@
                 </span>
               </template>
               <template v-if="!disabled || !disabledNoPreview">
-                <el-tooltip content="预览" placement="top">
+                <el-tooltip :content="t('fsUpload.preview')" placement="top">
                   <span style="cursor: pointer" @click="preview(file.showName, file.serverPath)">
                     <span style="margin-left: 6.5px">{{ file.showName }}</span>
                   </span>
                 </el-tooltip>
               </template>
-              <el-tooltip v-if="!disabled || !disabledNoDownload" content="下载" placement="top">
+              <el-tooltip v-if="!disabled || !disabledNoDownload" :content="t('fsUpload.download')" placement="top">
                 <el-icon style="margin-left: 10px" @click="handleDownload(file)">
                   <Download />
                 </el-icon>
               </el-tooltip>
-              <el-tooltip v-if="!disabled" content="移除" placement="top">
+              <el-tooltip v-if="!disabled" :content="t('fsUpload.delete')" placement="top">
                 <el-icon @click="handleOnRemove(file)"><Close /></el-icon>
               </el-tooltip>
             </div>
@@ -47,7 +47,7 @@
         <el-icon><Delete /></el-icon>
       </span>
     </span>
-    <el-dialog v-model="dialogVisible" title="预览" width="500">
+    <el-dialog v-model="dialogVisible" :title="t('fsUpload.preview')" width="500">
       <el-image :preview-src-list="previewSrcList" :src="previewImageInfo.src" />
     </el-dialog>
   </div>
@@ -66,6 +66,8 @@ import { getToken } from '../../../src/utils/auth'
 import { isImage } from '../../../src/utils/util'
 import { Base64 } from 'js-base64'
 import { getFileIconByName } from '../../../src/utils/file-util'
+import { useI18n } from 'vue-i18n'
+const { t } = useI18n()
 const props = defineProps({
   systemCode: {
     type: String,

package/packages/super-grid/src/custom-formatter.js

@@ -212,7 +212,7 @@ const customFormatter = {
       // console.log('getHyperLinkSetting--resut=', result)
       if (result && result.label && result.label !== '') {
         console.log('label存在')
-      } else if(result && (result.displayTextJudge === undefined || result.displayTextJudge)){
+      } else if (result && (result.displayTextJudge === undefined || result.displayTextJudge)) {
         result.label = this.objectPropValueTwo(row, column)
       }
       if (result && result.title && result.title !== '') {
@@ -249,14 +249,8 @@ const customFormatter = {
       // 解析是否需要显示该超链接
       let canClick = true
       const gridParams = store.get(listCode)
-      console.log('super-grid---jumpPageLink--jumpPageSetting=', jumpPageSetting)
       if (jumpPageSetting.beforeClick) {
         const funName = jumpPageSetting.beforeClick
-        console.log('super-grid---jumpPageLink--jumpPageSetting.beforeClick=', funName)
-        console.log(
-          'super-grid---jumpPageLink--gridParams.options[eventCallBack]=',
-          gridParams.options['eventCallBack']
-        )
         if (
           gridParams.options &&
           gridParams.options['eventCallBack'] &&
@@ -287,11 +281,23 @@ const customFormatter = {
     if (gridParams.options.extraParam && gridParams.options.extraParam.entityMap) {
       parentFormData = gridParams.options.extraParam.entityMap
     }
-    console.log('gridParams.options.extraParam.entityMap', gridParams.options.extraParam)
-
+    if (gridParams.isSubTableShowPage && jumpPageSetting.jumpPageAdditional?.length > 0) {
+      // 如果是子表，则需要把配置的 ${data.字段} 改成 ${parent.字段}
+      jumpPageSetting.jumpPageAdditional.forEach((item, index) => {
+        if (item && item.paramValue) {
+          if (item.paramValue.startsWith('${data.')) {
+            item.paramValue = item.paramValue.replace('${data.', '${parent.')
+          }
+        }
+      })
+    }
     /// 把父页面的pageData传给弹出的页面或新页签
     const copyPageData = JSON.parse(
-      JSON.stringify(gridParams.pageContext && gridParams.pageContext.entity && gridParams.pageContext.entity.page ? gridParams.pageContext.entity.page : {})
+      JSON.stringify(
+        gridParams.pageContext && gridParams.pageContext.entity && gridParams.pageContext.entity.page
+          ? gridParams.pageContext.entity.page
+          : {}
+      )
     )
     jumpPageSetting._pageData = copyPageData
     jumpToPage(

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

@@ -699,6 +699,10 @@ export default {
     const colConfigure = gridParams.colConfigureMap ? gridParams.colConfigureMap[this.column.prop] : null
     const runtimeInfo = colConfigure && colConfigure.runtime ? colConfigure.runtime : {}
     const designProperty = runtimeInfo.props ? runtimeInfo.props : {}
+    let systemCode
+    if (gridParams && gridParams.basicInfo && gridParams.basicInfo.systemCode) {
+      systemCode = gridParams.basicInfo.systemCode
+    }
     return {
       deptManTree: false, // 是否是部门人员树
       isMultiTree: false, // 是否是多选树
@@ -763,7 +767,8 @@ export default {
       baseURL,
       colConfigure, // v10字段配置原信息
       designProperty, // 字段配置
-      myCustomParams: {}
+      myCustomParams: {},
+      systemCode
     }
   },
   computed: {},
@@ -1943,7 +1948,7 @@ export default {
         const message = {
           type: 'scan',
           componentId: this.componentId,
-          systemCode: this.pageContext.systemCode,
+          systemCode: this.systemCode,
           listCode: this.listCode
         }
         if (this.isDingTalk) {

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

@@ -151,7 +151,10 @@ export default {
     if (gridParams.options.extraParam && gridParams.options.extraParam.entityMap) {
       parentFormData = gridParams.options.extraParam.entityMap
     }
-
+    let controlConfig = {}
+    if (this.column.controlConfig) {
+      controlConfig = JSON.parse(this.column.controlConfig)
+    }
     return {
       selectRow: null,
       that: this,
@@ -162,7 +165,8 @@ export default {
       isShowAdd: false, // 是否显示表头的新增按钮
       cellWidth: null,
       parentFormData,
-      options
+      options,
+      controlConfig
     }
   },
   computed: {
@@ -290,9 +294,9 @@ export default {
       gridParams.options.showOperationButton
   },
   mounted() {
-    if(this.column.prop === 'operation'){
+    if (this.column.prop === 'operation') {
       const that = this
-      eventBus.$on('change-add-state',(value)=>{
+      eventBus.$on('change-add-state', (value) => {
         that.isShowAdd = value
       })
     }

package/packages/super-grid/src/search-form-advancedQuery.vue

@@ -278,7 +278,7 @@
 							@focus="selectRow(scope.row)"
 							@input="setValueToModelProp(scope.$index, $event)"
 					/>
-					<span v-else-if="customComponent(scope.row.prop) === true">
+					<span v-else-if="customComponent(scope.row.prop) === true" style="width: 100%">
             <component
 		            :is="scope.row.componentName"
 		            :ref="scope.row.componentName"

package/packages/super-grid/src/search-form-item.vue

@@ -9,7 +9,7 @@
         v-html="(column.searchLabel ?? column.label).replace(/\\n/g, '</br>')"
       />
     </template>
-    <span v-if="customComponent(column) === true">
+    <span v-if="customComponent(column) === true" style="width: 100%">
       <component
         :is="column.componentName"
         :ref="column.componentName"
@@ -169,7 +169,6 @@
         :options="getDynamicDataSourceOptions(column)"
         :table-name="tableName"
         @change="multiselectChange"
-        @input="setValueToModelProp(column.prop, $event)"
       />
     </template>
     <!--
@@ -217,11 +216,8 @@
       @blur="hiddenEmpty()"
     >
       <template #suffix>
-        <el-tooltip
-          :content="$t('superGrid.searchEmpty')"
-          placement="bottom"
-        >
-          <el-checkbox v-if="isShowEmtpty" v-model="checkedEmpty" @change="checkEmptyChange"/>
+        <el-tooltip :content="$t('superGrid.searchEmpty')" placement="bottom">
+          <el-checkbox v-if="isShowEmtpty" v-model="checkedEmpty" @change="checkEmptyChange" />
         </el-tooltip>
       </template>
     </el-input>
@@ -293,7 +289,7 @@ export default {
       moduleConfig: {},
       dateVal: this.getFormItemValue(this.column.prop),
       controlConfig: getControlConfig(this.column),
-      isShowEmtptyFlag: false,
+      isShowEmtptyFlag: false
       // checkedEmpty: false,
     }
   },
@@ -308,12 +304,12 @@ export default {
     isShowEmtpty() {
       return this.isShowEmtptyFlag
     },
-    checkedEmpty(){
-      if(this.column._emptyValue  && this.column._emptyValue === '#blank#'){
+    checkedEmpty() {
+      if (this.column._emptyValue && this.column._emptyValue === '#blank#') {
         return true
       }
-      if(this.column._resetValue || this.column._resetValue === undefined){
-        if(this.column._resetValue){
+      if (this.column._resetValue || this.column._resetValue === undefined) {
+        if (this.column._resetValue) {
           this.column._resetValue = undefined
           this.isShowEmtptyFlag = false
         }
@@ -350,9 +346,7 @@ export default {
       return isDynamicDataSourceSource(column)
     },
     setValueToModelProp(prop, value, componentName, index) {
-      console.log(
-        '%c描述-105004',
-        'color:#2E3435;background:#F8BB07;padding:3px;border-radius:2px',
+      console.log('setValueToModelProp',
         prop,
         value,
         componentName,
@@ -503,31 +497,37 @@ export default {
           return ['00:00:00']
         }
       } else {
-        return ['00:00:00']
+        const now = new Date();
+        const year = now.getFullYear(); // e.g., 2023
+        const month = now.getMonth() + 1; // Months are 0-indexed, so add 1
+        const day = now.getDate(); // Day of the month        
+        return [`${year}-${month}-${day} 00:00:00`, `${year}-${month}-${day} 23:59:59`]
       }
     },
     multiselectChange(arr, selectedItem) {
-      if (arr.indexOf('saveAll') !== -1) {
+      debugger
+      if (arr && arr.indexOf('saveAll') !== -1) {
         if (this.searchForm[this.column.prop] && typeof this.searchForm[this.column.prop] === 'string') {
           this.searchForm[this.column.prop] = this.searchForm[this.column.prop].split(',')
         }
       } else {
+        debugger
         this.searchForm[this.column.prop] = arr
       }
     },
-    showEmpty(){
+    showEmpty() {
       this.isShowEmtptyFlag = true
     },
-    hiddenEmpty(){
-      if(!this.checkedEmpty){
+    hiddenEmpty() {
+      if (!this.checkedEmpty) {
         this.isShowEmtptyFlag = false
       }
     },
     checkEmptyChange(newValue) {
-      if(newValue){
-        this.column._emptyValue='#blank#'
+      if (newValue) {
+        this.column._emptyValue = '#blank#'
       } else {
-        this.column._emptyValue=undefined
+        this.column._emptyValue = undefined
       }
     }
   },